Changeset 3909 for TI01-discovery

Timestamp:

19/05/08 17:14:53 (11 years ago)

Author:

cbyrom

Message:

Add default logger use to keywordAdder + tidy up code.

File:

• TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/keywordAdder.py (modified) (6 diffs)

TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/keywordAdder.py

@@ -24 +24 @@
         from ndgUtils.elementtree import cElementTree
 import molesReadWrite as MRW
-import sys
-import os
+import sys, os, logging
+
 
 def PrettyPrint(elem,indent='',html=0,space='   '):
@@ -57 +57 @@
 
     if (len(keywords))%3 != 0:
-        print "Keywords must be in triples. keyword namespace key."
+        print "ERROR: Keywords must be in triples: keyword namespace key."
+        print "Actual: ", keywords
         sys.exit()
 
-    print "INFO: moles records are in %s" %indir
-    print "INFO: moles records output to %s" %outdir
-    print "INFO: keywords to add are %s" %keywords
+    logging.info("moles records are in %s" %indir)
+    logging.info("moles records output to %s" %outdir)
+    logging.info("keywords to add are %s" %keywords)
 
     # initialise variables
@@ -71 +72 @@
     count=0
     while count < len(keywords)/3:
-        #print "count = %s. keywordList = %s" %(count, keywordList)
         keywordList.append([])
         keywordList[count].append(keywords[(count*3)])
@@ -77 +77 @@
         keywordList[count].append(keywords[(count*3)+2])
         count=count+1
-    #print "Final keywordList = %s" %keywordList
 
     # moles skeleton for creating new objects
@@ -96 +95 @@
                     strParentListID=str(keyword[1])
                     strTermID=str(keyword[2])
-                    print strValidTerm, strParentListID, strTermID
                     dgVTID=M.dgValidTermID(ParentListID=strParentListID, TermID=strTermID)
                     dgSK=M.dgStructuredKeyword(dgValidTerm=strValidTerm, dgValidTermID=dgVTID)
                     dgMeta.dgMetadataRecord.addChildElem('dgStructuredKeyword', dgSK)
-    
+
                 # now write out updated document
-                #print dir(dgMeta.dgMetadataRecord)
                 molestree=dgMeta.toXML()
                 moles=PrettyPrint(molestree)
@@ -109 +106 @@
                 f.close()
                 numfilesproc += 1
-            except:
-                print "WARNING: Cannot parse the XML moles document %s. Will not process" %full_filename
+            except Exception, detail:
+                logging.error("Cannot parse the XML moles document %s. Will not process" %full_filename)
+                logging.error("Detail: %s" %detail)
                 continue
 
         else:
-            print "WARNING: File %s appears not to be XML. Will not be processed." %filename
+            logging.error("File %s appears not to be XML. Will not be processed." %filename)
 
-    print 'INFO: keywordAdder.py ran to end. files processed= %s' %(numfilesproc)
+    logging.info('keywordAdder.py ran to end. files processed= %s' %(numfilesproc))