Changeset 25647

Timestamp:

2012-05-23T16:43:48+12:00 (12 years ago)

Author:

sjm84

Message:

More reformatting and minor fixes

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (11 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -305 +305 @@
         Element securityBlock = (Element) GSXML.getChildByTagName(coll_config_xml, GSXML.SECURITY_ELEM);
 
-        if(securityBlock == null)
+        if (securityBlock == null)
         {
             return;
         }
-        
+
         String scope = securityBlock.getAttribute(GSXML.SCOPE_ATT);
         String defaultAccess = securityBlock.getAttribute(GSXML.DEFAULT_ACCESS_ATT);
@@ -595 +595 @@
             if (subaction.equals("saveDocument"))
             {
-                int k;
                 Element format_element = (Element) GSXML.getChildByTagName(request, GSXML.FORMAT_STRING_ELEM);
                 //String format_string = GSXML.getNodeText(format_element);
@@ -601 +600 @@
                 Element display_format = (Element) format_element.getFirstChild();
 
-                String format_string = GSXML.xmlNodeToString(display_format, false);
                 String collection_config = directory + "collectionConfig.xml";
                 Document config = this.converter.getDOM(new File(collection_config), "UTF-8");
@@ -758 +756 @@
         {
             String oid = request.getAttribute("oid");
-            if(oid.contains("."))
+            if (oid.contains("."))
             {
                 oid = oid.substring(0, oid.indexOf("."));
             }
-            
+
             ArrayList<String> groups = getPermittedGroups(oid);
-            
+
             Element groupList = this.doc.createElement(GSXML.GROUP_ELEM + GSXML.LIST_MODIFIER);
             response.appendChild(groupList);
-            
-            for(String groupName : groups)
+
+            for (String groupName : groups)
             {
                 Element group = this.doc.createElement(GSXML.GROUP_ELEM);
@@ -786 +784 @@
     {
         ArrayList<String> groups = new ArrayList<String>();
-        
+
         if (_securityScopeCollection)
         {
@@ -806 +804 @@
         else
         {
-            if(oid != null && !oid.equals(""))
+            if (oid != null && !oid.equals(""))
             {
                 boolean inSet = false;
@@ -823 +821 @@
                     }
                 }
-                
-                if(!inSet && _publicAccess)
+
+                if (!inSet && _publicAccess)
                 {
                     groups.add("");
@@ -864 +862 @@
             {
                 fieldValue = getFieldValue(oid, fieldName);
-                if(fieldValue == null)
+                if (fieldValue == null)
                 {
                     return false;
@@ -876 +874 @@
             String matchValue = GSXML.getNodeText(currentMatchStatement);
             if (type.equals("match"))
-            { 
-                if(matchValue.equals(fieldValue))
+            {
+                if (matchValue.equals(fieldValue))
                 {
                     return true;
@@ -884 +882 @@
             else if (type.equals("regex"))
             {
-                if(fieldValue.matches(matchValue))
+                if (fieldValue.matches(matchValue))
                 {
                     return true;
@@ -906 +904 @@
         Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         metadataRequest.appendChild(paramList);
-        
+
         Element param = this.doc.createElement(GSXML.PARAM_ELEM);
         paramList.appendChild(param);
-        
+
         param.setAttribute(GSXML.NAME_ATT, "metadata");
         param.setAttribute(GSXML.VALUE_ATT, fieldName);
-        
+
         Element docList = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         metadataRequest.appendChild(docList);
-        
+
         Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
         docList.appendChild(doc);
-        
+
         doc.setAttribute(GSXML.NODE_ID_ATT, oid);
-        
+
         Element response = (Element) this.router.process(metadataMessage);
         NodeList metadataElems = response.getElementsByTagName(GSXML.METADATA_ELEM);
-        
-        if(metadataElems.getLength() > 0)
+
+        if (metadataElems.getLength() > 0)
         {
             Element metadata = (Element) metadataElems.item(0);
             return GSXML.getNodeText(metadata);
         }
-        
+
         return null;
     }