Changeset 4663 for exist


Ignore:
Timestamp:
16/12/08 15:47:24 (11 years ago)
Author:
cbyrom
Message:

Re-organise contents of ndgUtils to make more logical and refactor references.

Location:
exist/trunk/python
Files:
16 edited
4 moved

Legend:

Unmodified
Added
Removed
  • exist/trunk/python/ndgUtils/__init__.py

    r3158 r4663  
    77from ndgRetrieve import ndgRetrieve 
    88from DocumentRetrieve import DocumentRetrieve 
    9 import BeautifulSoup 
     9import lib.BeautifulSoup 
    1010from xmlHandler2 import xmlHandler 
    1111from ndgXqueries import ndgXqueries 
  • exist/trunk/python/ndgUtils/lib/atomvalidator.py

    r4636 r4663  
    1313import logging, traceback, datetime, xmlrpclib, socket 
    1414import ndgUtils.lib.existdbclient as edc 
    15 from ndgUtils.vocabtermdata import isValidTermURI 
     15from ndgUtils.models.vocabtermdata import isValidTermURI 
    1616from ndgUtils.models.Atom import Atom 
    1717from ndgUtils.ndgXqueries import ndgXqueries 
  • exist/trunk/python/ndgUtils/lib/existatomvalidator.py

    r4627 r4663  
    88import os, sys, getopt, logging 
    99import ndgUtils.lib.existdbclient as edc 
    10 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     10from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1111from ndgUtils.models.Atom import Atom 
    1212from ndgUtils.lib.atomvalidator import AtomValidator 
  • exist/trunk/python/ndgUtils/lib/granulite.py

    r4627 r4663  
    1010from ndgUtils.models import Atom 
    1111import ndgUtils.lib.utilities as utilities 
    12 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     12from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1313import ndgUtils.lib.existdbclient as edc 
    1414 
  • exist/trunk/python/ndgUtils/lib/utilities.py

    r4640 r4663  
    11import os, sys, logging, re, cgi, urlparse, httplib, time, urllib2, socket 
    2 from ndgUtils.ETxmlView import subAI 
    32from ndgUtils import ndgObject 
    43import csml.csmlscan as CsmlScan 
     
    87@author: C Byrom 
    98''' 
    10 _subtool = subAI()    # tool to escape angular brackets - enable as field variable for easy reuse 
    11  
    129ISO8601_RE = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T\s]?([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?" + \ 
    1310    "(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?" 
  • exist/trunk/python/ndgUtils/models/Atom.py

    r4627 r4663  
    1717from ndgUtils.ETxmlView import et2text 
    1818import ndgUtils.lib.utilities as utilities 
    19 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     19from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    2020from ndgUtils.models import MolesEntity as ME 
    2121import csml.parser as CsmlParser 
  • exist/trunk/python/ndgUtils/models/Deployment.py

    r4535 r4663  
    55''' 
    66import logging 
    7 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     7from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    88 
    99 
  • exist/trunk/python/ndgUtils/models/stubB.py

    r4490 r4663  
    99 
    1010from ndgUtils.lib.utilities import wrapGetText 
    11 from ndgUtils.BeautifulSoup import BeautifulSoup 
     11from ndgUtils.lib.BeautifulSoup import BeautifulSoup 
    1212from AccessControl import AccessControl 
    1313from ndgUtils.models.molesbounding import Bounding as Bounding 
  • exist/trunk/python/ndgUtils/ndgRetrieve.py

    r4229 r4663  
    1 import DocumentRetrieve,xmlHandler2 
     1import DocumentRetrieve 
    22from ndgSearch import ndgSearch 
    33import cgi,time, logging 
  • exist/trunk/python/ndgutilstests/lib/testatomvalidator.py

    r4655 r4663  
    1010from ndgutilstests.testutils import testUtils as tu 
    1111from ndgUtils.models.Atom import Atom 
    12 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     12from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1313 
    1414class testAtomValidator(unittest.TestCase): 
  • exist/trunk/python/ndgutilstests/lib/testexistdbclient.py

    r4655 r4663  
    1111from ndgUtils.ndgXqueries import ndgXqueries 
    1212from ndgUtils.models.Atom import Atom 
    13 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     13from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1414import ndgutilstests.testconstants as tc 
    1515from ndgutilstests.testutils import testUtils as tu 
  • exist/trunk/python/ndgutilstests/lib/testgranulite.py

    r4655 r4663  
    1616from ndgUtils.models.Atom import Atom 
    1717import ndgUtils.lib.existdbclient as dbc 
    18 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     18from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1919 
    2020class testGranulite(unittest.TestCase): 
  • exist/trunk/python/ndgutilstests/models/testVocabTermData.py

    r4488 r4663  
    66''' 
    77import unittest 
    8 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     8from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    99 
    1010GCMD_URI = 'http://vocab.ndg.nerc.ac.uk/term/P201/1' 
  • exist/trunk/python/ndgutilstests/models/testatom.py

    r4641 r4663  
    77import unittest, copy 
    88from ndgUtils.models.Atom import Atom, Link 
    9 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     9from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1010from ndgUtils.lib.utilities import getTripleData 
    1111import ndgutilstests.testconstants as tc 
  • exist/trunk/python/ndgutilstests/models/testmolesentity.py

    r4488 r4663  
    77import unittest, datetime 
    88import ndgUtils.models.MolesEntity as ME 
    9 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     9from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1010 
    1111class testMolesEntity(unittest.TestCase): 
  • exist/trunk/python/ndgutilstests/testconstants.py

    r4655 r4663  
    1313__revision__ = '$Id: $' 
    1414 
    15 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     15from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1616import os 
    1717 
  • exist/trunk/python/ndgutilstests/testutils.py

    r4655 r4663  
    1313__revision__ = '$Id: $' 
    1414 
    15 from ndgUtils.vocabtermdata import VocabTermData as VTD 
     15from ndgUtils.models.vocabtermdata import VocabTermData as VTD 
    1616import ndgUtils.lib.existdbclient as dbc 
    1717from ndgUtils.models.Atom import Atom 
Note: See TracChangeset for help on using the changeset viewer.