Changeset 37204 for main

Timestamp:

2023-01-29T11:57:00+13:00 (15 months ago)

Author:

davidb

Message:

Copy tidy-up, mostly changing whitespace to tabs to improve indentation display

Location:

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

Files:

• build/CollectionConstructor.java (modified) (2 diffs)
• build/GS2PerlConstructor.java (modified) (3 diffs)
• service/GS2Construct.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/CollectionConstructor.java

@@ -16 +16 @@
     /** the name of the site */
     protected String site_name = null;
-  /** the library (servlet) name of the site */
-  protected String library_name = null;
+    /** the library (servlet) name of the site */
+    protected String library_name = null;
     /** the name of the collection */
     protected String collection_name = null;
@@ -75 +75 @@
     }
 
-  public void setLibraryName(String library_name) {
-    this.library_name = library_name;
-  }
+    public void setLibraryName(String library_name) {
+        this.library_name = library_name;
+    }
     public void setCollectionName(String coll_name)
     {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -313 +313 @@
 
         Vector<String> command = new Vector<String>();
-
+                
         String perlPath = GlobalProperties.getProperty("perl.path", "perl");
         if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar)
@@ -320 +320 @@
         }
 
-        String cgi_directory = GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi";
         command.add(perlPath + "perl");
         command.add("-S");
-        //command.add(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi" + File.separator + "metadata-server.pl");
+
+        String cgi_directory = GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi";
         command.add(cgi_directory + File.separator + "metadata-server.pl");
         
@@ -349 +349 @@
         // setenv QUERY_STRING and REQUEST_METHOD = GET.
         if (runPerlCommand(command_str, envvars, new File(cgi_directory)))
-                   //new File(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi")))
         {
             // success!! - need to send the final completed message

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -869 +869 @@
             }
             
-            if(oid != null) { // if we have only one oid
+            if (oid != null) { // if we have only one oid
             markDocumentInFlatDatabase("R", coll_name, OID.getTop(oid));
             } else if (docids != null) { // check if we are dealing with many doc ids, as cold in theory happen when set-metadata-array is called