Changeset 990

Timestamp:

12/14/10 10:47:01 (13 years ago)

Author:

dietuyt

Message:

Changed the script, as our harvester no longer uses the directory
structure with the numbers. Now it directly processes all child directories
from where the script is started.

File:

• metadata/trunk/toolkit/scripts/dir2cmdicollection.py (modified) (2 diffs)

metadata/trunk/toolkit/scripts/dir2cmdicollection.py

@@ -31 +31 @@
         
         if not simple_dir_structure:
-                for root, dirs, files in os.walk(os.getcwd()):
-                        startpath = os.getcwd()         
-                        for d in dirs:
-                                if d == "0":
-                                        rootList.append(generate_branch(root, dirs))
+                root = os.getcwd()              
+                dirs = filter (os.path.isdir, os.listdir(root))         
+                dirs.remove(target_dir.replace("/",""))
+                #for root, dirs, files in os.walk(os.getcwd()):
+                print dirs              
+                for d in dirs:          
+                        rootList.append(generate_branch(root, [d], d))
+                        #startpath = os.getcwd()                
+                        #for d in dirs:
+                                #if d == "0":
+                                
         else:
                 rootList.append(generate_branch(os.getcwd(), [""], "lrt_inventory"))
         writeCollection(rootList, "collection_root.cmdi", "olac-root")
 
-def generate_branch(root, dirs):
-        collectionName = os.path.relpath(root)
-        return generate_branch(root, dirs, collectionName)
+#def generate_branch(root, dirs):
+#       collectionName = os.path.relpath(root)
+#       print collectionName
+#       return generate_branch(root, dirs, collectionName)
 
 def generate_branch(root, dirs, collectionName):
@@ -52 +59 @@
         for d in dirs:
                 fullpath = os.path.join(root, d)
+                print fullpath
                 for file in os.listdir(fullpath):
                         if ".cmdi" in file: