Changeset 4663 for exist

Timestamp:

16/12/08 15:47:24 (12 years ago)

Author:

cbyrom

Message:

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

Location:

exist/trunk/python

Files:

• ndgUtils/__init__.py (modified) (1 diff)
• ndgUtils/lib/BeautifulSoup.py (moved) (moved from exist/trunk/python/ndgUtils/BeautifulSoup.py)
• ndgUtils/lib/atomvalidator.py (modified) (1 diff)
• ndgUtils/lib/existatomvalidator.py (modified) (1 diff)
• ndgUtils/lib/fileutilities.py (moved) (moved from exist/trunk/python/ndgUtils/fileutilities.py)
• ndgUtils/lib/granulite.py (modified) (1 diff)
• ndgUtils/lib/utilities.py (modified) (2 diffs)
• ndgUtils/models/Atom.py (modified) (1 diff)
• ndgUtils/models/Deployment.py (modified) (1 diff)
• ndgUtils/models/stubB.py (modified) (1 diff)
• ndgUtils/models/vocabtermdata.py (moved) (moved from exist/trunk/python/ndgUtils/vocabtermdata.py)
• ndgUtils/ndgRetrieve.py (modified) (1 diff)
• ndgutilstests/lib/testatomvalidator.py (modified) (1 diff)
• ndgutilstests/lib/testexistdbclient.py (modified) (1 diff)
• ndgutilstests/lib/testgranulite.py (modified) (1 diff)
• ndgutilstests/models/testVocabTermData.py (moved) (moved from exist/trunk/python/ndgutilstests/testVocabTermData.py) (1 diff)
• ndgutilstests/models/testatom.py (modified) (1 diff)
• ndgutilstests/models/testmolesentity.py (modified) (1 diff)
• ndgutilstests/testconstants.py (modified) (1 diff)
• ndgutilstests/testutils.py (modified) (1 diff)

exist/trunk/python/ndgUtils/__init__.py

@@ -7 +7 @@
 from ndgRetrieve import ndgRetrieve
 from DocumentRetrieve import DocumentRetrieve
-import BeautifulSoup
+import lib.BeautifulSoup
 from xmlHandler2 import xmlHandler
 from ndgXqueries import ndgXqueries

exist/trunk/python/ndgUtils/lib/atomvalidator.py

@@ -13 +13 @@
 import logging, traceback, datetime, xmlrpclib, socket
 import ndgUtils.lib.existdbclient as edc
-from ndgUtils.vocabtermdata import isValidTermURI
+from ndgUtils.models.vocabtermdata import isValidTermURI
 from ndgUtils.models.Atom import Atom
 from ndgUtils.ndgXqueries import ndgXqueries

exist/trunk/python/ndgUtils/lib/existatomvalidator.py

@@ -8 +8 @@
 import os, sys, getopt, logging
 import ndgUtils.lib.existdbclient as edc
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 from ndgUtils.models.Atom import Atom
 from ndgUtils.lib.atomvalidator import AtomValidator

exist/trunk/python/ndgUtils/lib/granulite.py

@@ -10 +10 @@
 from ndgUtils.models import Atom
 import ndgUtils.lib.utilities as utilities
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 import ndgUtils.lib.existdbclient as edc
 

exist/trunk/python/ndgUtils/lib/utilities.py

@@ -1 +1 @@
 import os, sys, logging, re, cgi, urlparse, httplib, time, urllib2, socket
-from ndgUtils.ETxmlView import subAI
 from ndgUtils import ndgObject
 import csml.csmlscan as CsmlScan
@@ -8 +7 @@
 @author: C Byrom
 '''
-_subtool = subAI()    # tool to escape angular brackets - enable as field variable for easy reuse
-
 ISO8601_RE = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T\s]?([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?" + \
     "(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?"

exist/trunk/python/ndgUtils/models/Atom.py

@@ -17 +17 @@
 from ndgUtils.ETxmlView import et2text
 import ndgUtils.lib.utilities as utilities
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 from ndgUtils.models import MolesEntity as ME
 import csml.parser as CsmlParser

exist/trunk/python/ndgUtils/models/Deployment.py

@@ -5 +5 @@
 '''
 import logging
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 
 

exist/trunk/python/ndgUtils/models/stubB.py

@@ -9 +9 @@
 
 from ndgUtils.lib.utilities import wrapGetText
-from ndgUtils.BeautifulSoup import BeautifulSoup
+from ndgUtils.lib.BeautifulSoup import BeautifulSoup
 from AccessControl import AccessControl
 from ndgUtils.models.molesbounding import Bounding as Bounding

exist/trunk/python/ndgUtils/ndgRetrieve.py

@@ -1 @@
-import DocumentRetrieve,xmlHandler2
+import DocumentRetrieve
 from ndgSearch import ndgSearch
 import cgi,time, logging

exist/trunk/python/ndgutilstests/lib/testatomvalidator.py

@@ -10 +10 @@
 from ndgutilstests.testutils import testUtils as tu
 from ndgUtils.models.Atom import Atom
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 
 class testAtomValidator(unittest.TestCase):

exist/trunk/python/ndgutilstests/lib/testexistdbclient.py

@@ -11 +11 @@
 from ndgUtils.ndgXqueries import ndgXqueries
 from ndgUtils.models.Atom import Atom
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 import ndgutilstests.testconstants as tc
 from ndgutilstests.testutils import testUtils as tu

exist/trunk/python/ndgutilstests/lib/testgranulite.py

@@ -16 +16 @@
 from ndgUtils.models.Atom import Atom
 import ndgUtils.lib.existdbclient as dbc
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 
 class testGranulite(unittest.TestCase):

exist/trunk/python/ndgutilstests/models/testVocabTermData.py

@@ -6 +6 @@
 '''
 import unittest
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 
 GCMD_URI = 'http://vocab.ndg.nerc.ac.uk/term/P201/1'

exist/trunk/python/ndgutilstests/models/testatom.py

@@ -7 +7 @@
 import unittest, copy
 from ndgUtils.models.Atom import Atom, Link
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 from ndgUtils.lib.utilities import getTripleData
 import ndgutilstests.testconstants as tc

exist/trunk/python/ndgutilstests/models/testmolesentity.py

@@ -7 +7 @@
 import unittest, datetime
 import ndgUtils.models.MolesEntity as ME
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 
 class testMolesEntity(unittest.TestCase):

exist/trunk/python/ndgutilstests/testconstants.py

@@ -13 +13 @@
 __revision__ = '$Id: $'
 
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 import os
 

exist/trunk/python/ndgutilstests/testutils.py

@@ -13 +13 @@
 __revision__ = '$Id: $'
 
-from ndgUtils.vocabtermdata import VocabTermData as VTD
+from ndgUtils.models.vocabtermdata import VocabTermData as VTD
 import ndgUtils.lib.existdbclient as dbc
 from ndgUtils.models.Atom import Atom