Changeset 26754

Timestamp:

2013-01-19T15:29:32+13:00 (11 years ago)

Author:

davidb

Message:

When loading in collection/collection item objects each frameset directory will be searched for a collection.inf file. If this file exists then the frameset is considered a GlamED collection.

File:

• other-projects/GlamED/trunk/src/org/honours/Main.java (modified) (5 diffs)

other-projects/GlamED/trunk/src/org/honours/Main.java

@@ -18 +18 @@
 
 /**
- * Main class for the cultural collections
- * management system.
+ * Main class for the GlamED cultural 
+ * collections management system.
  * @author Korii
  */
@@ -30 +30 @@
     public static final String GSDL_HOME = "greenstone3-svn\\web";
     
-    //
     public static final String GSDL_COLLECT_PATH = GSDL_HOME + File.separator + "sites" + File.separator + "localsite" +
             File.separator + "collect" + File.separator;
@@ -39 +38 @@
     public static final int _assocfilePathXpos = 175;
     public static final int _assocfilePathYpos = 101;
+    
+    //Collection info file name.
+    private static final String COLLECTION_INF_FILE = "collection.inf";
+    
     
     /**
@@ -108 +111 @@
     /**
      * Set up collection objects which last for entire runtime.
-     * A "Collections" directory has been specially created where
-     * collection framesets from GSDL are kept. This method will only
-     * search this directory for collections (and not any other directories
-     * where framesets are kept).
+     * TODO: It would be good to set up a "Collections" frameset directory
+     * to import framesets from Greenstone into. However at this stage, accessing
+     * framesets not in the default framesets location makes loading them
+     * a lot slower.
      * @throws Exception
      */
     private static void setUpCollectionObjects() throws Exception{
         
-        //File collectionsDir = new File(HonoursFrameIO.COLLECTIONS_PATH);
-        
         File collectionsDir = new File(FrameIO.FRAME_PATH);
+        
         
         if(collectionsDir.isDirectory()){
@@ -130 +132 @@
                     continue;
                 
+                //Check if directory is a collection frameset from Greenstone.
                 String fName = f.getName();
-                
-                //TODO: Change this so that "collection" framesets have their own special way of being identified.
-                if(fName.equals("collectionsmain") || fName.equals("exhibitionsmain") || fName.equals("interface-overlays") || fName.equals("notesmain") || fName.equals("documentation")){
+                File[] children = f.listFiles();
+                boolean isCollection = false;
+                
+                for(int i =0; i < children.length; i++){
+                    String currChildName = children[i].getName();
+                    if(currChildName.equals(COLLECTION_INF_FILE)){
+                        isCollection = true;
+                    }
+                }
+                
+                if(!isCollection)
                     continue;
-                }
-                
+    
                 Collection collect = obtainCollectionItems(fName);