Changeset 26026

Timestamp:

2012-07-26T11:04:08+12:00 (12 years ago)

Author:

sjm84

Message:

Analyse xsl files in advance to find out what metadata we need

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/Action.java (modified) (3 diffs)
• action/BrowseAction.java (modified) (1 diff)
• action/DocumentAction.java (modified) (1 diff)
• action/GS2BrowseAction.java (modified) (1 diff)
• action/QueryAction.java (modified) (1 diff)
• util/GSFile.java (modified) (2 diffs)
• util/GSXML.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -112 +112 @@
             if (!pos.equals(""))
             {
-                metadata.append("pos"+pos); // first, last or indexing number
+                metadata.append("pos" + pos); // first, last or indexing number
                 metadata.append(GSConstants.META_RELATION_SEP);
             }
@@ -174 +174 @@
             }
         }
-        
-        NodeList image_nodes = format.getElementsByTagName("gsf:image");
-        for(int i = 0; i < image_nodes.getLength(); i++)
-        {
-            if(format.getElementsByTagName("gsf:image").getLength() > 0)
-            {
-                meta_names.add("Thumb");
-                meta_names.add("Screen");
-                meta_names.add("SourceFile");
-            }
+
+        if (format.getElementsByTagName("gsf:image").getLength() > 0)
+        {
+            meta_names.add("Thumb");
+            meta_names.add("Screen");
+            meta_names.add("SourceFile");
         }
     }
@@ -258 +254 @@
     {
         Element documentOptionList = this.doc.createElement("interfaceOptions");
-        for(Object key : this.config_params.keySet())
+        for (Object key : this.config_params.keySet())
         {
             Element option = this.doc.createElement("option");
-            option.setAttribute(GSXML.NAME_ATT, (String)key);
+            option.setAttribute(GSXML.NAME_ATT, (String) key);
             option.setAttribute(GSXML.VALUE_ATT, this.config_params.get(key).toString());
             documentOptionList.appendChild(option);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

@@ -143 +143 @@
                 page_response.appendChild(new_format);
                 getRequiredMetadataNames(new_format, metadata_names);
+            }
+        }
+        
+        Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+        if(extraMetaListElem != null)
+        {
+            NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
+            for(int i = 0; i < extraMetaList.getLength(); i++)
+            {
+                metadata_names.add(((Element)extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
             }
         }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -381 +381 @@
             getRequiredMetadataNames(format_elem, meta_names);
         }
+        
+        Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+        if(extraMetaListElem != null)
+        {
+            NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
+            for(int i = 0; i < extraMetaList.getLength(); i++)
+            {
+                meta_names.add(((Element)extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
+            }
+        }
 
         Element dm_param_list = createMetadataParamList(meta_names);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

@@ -132 +132 @@
                 Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
                 extractMetadataNames(new_format, doc_meta_names, class_meta_names);
+                
+                Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+                if(extraMetaListElem != null)
+                {
+                    NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
+                    for(int i = 0; i < extraMetaList.getLength(); i++)
+                    {
+                        class_meta_names.add(((Element)extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
+                    }
+                }
+                
                 // set the format type
                 new_format.setAttribute(GSXML.TYPE_ATT, "browse");

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -228 +228 @@
         // metadata that it wants, and QueryAction should look through the format stuff to see if there is any other?
 
+        Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+        if(extraMetaListElem != null)
+        {
+            NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
+            for(int i = 0; i < extraMetaList.getLength(); i++)
+            {
+                metadata_names.add(((Element)extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
+            }
+        }
+
         Element dm_param_list = createMetadataParamList(metadata_names);
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -32 +32 @@
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
+import java.util.Collection;
 
 import org.apache.log4j.*;
+import org.greenstone.util.GlobalProperties;
 
 /**
@@ -534 +536 @@
     }
 
+    public static ArrayList<File> getAllXSLFiles(String interfaceName, String siteName)
+    {
+        ArrayList<File> filesToReturn = new ArrayList<File>();
+        
+        File siteCollectionDir = new File(GSFile.siteHome(GlobalProperties.getGSDL3Home(), siteName) + File.separator + "collect");
+        if(siteCollectionDir.exists() && siteCollectionDir.isDirectory())
+        {
+            File[] collections = siteCollectionDir.listFiles();
+            
+            for(File collection : collections)
+            {
+                if(collection.isDirectory())
+                {
+                    File collectionTranformDir = new File(collection.getAbsolutePath() + File.separator + "transform");
+                    if(collectionTranformDir.exists() && collectionTranformDir.isDirectory())
+                    {
+                        filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(collectionTranformDir));
+                    }
+                }
+            }
+        }
+        
+        filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(new File(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interfaceName) + File.separator + "transform")));
+        
+        return filesToReturn;
+    }
+
+    protected static ArrayList<File> getXSLFilesFromDirectoryRecursive(File directory)
+    {
+        ArrayList<File> filesToReturn = new ArrayList<File>();
+        
+        if(!directory.isDirectory())
+        {
+            return filesToReturn;
+        }
+        
+        File[] currentFiles = directory.listFiles();
+        for(File current : currentFiles)
+        {
+            if(current.isDirectory())
+            {
+                filesToReturn.addAll(GSFile.getXSLFilesFromDirectoryRecursive(current));
+            }
+            else if(current.getName().endsWith(".xsl"))
+            {
+                filesToReturn.add(current);
+            }
+        }
+        
+        return filesToReturn;
+    }
 }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -79 +79 @@
     public static final String SYSTEM_ELEM = "system";
     public static final String FORMAT_STRING_ELEM = "formatString";
+    public static final String EXTRA_METADATA = "extraMetadata";
 
     //config file elems
@@ -134 +135 @@
     public static final String FROM_ATT = "from";
     public static final String LANG_ATT = "lang";
+    public static final String HREF_ATT = "href";
     public static final String TYPE_ATT = "type";
     public static final String DB_TYPE_ATT = "dbType";