Changeset 31771 for main

Timestamp:

2017-06-30T14:43:12+12:00 (7 years ago)

Author:

kjdon

Message:

we need to pass library_name to the incremental-buildcol so that it can deactivate the collection before modifying the database

Location:

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

Files:

• build/CollectionConstructor.java (modified) (2 diffs)
• build/GS2PerlConstructor.java (modified) (1 diff)
• 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 name of the collection */
     protected String collection_name = null;
@@ -73 +75 @@
     }
 
+  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

@@ -214 +214 @@
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
+        command.add("-library_name");
+        command.add(this.library_name);
 //      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
         command.addAll(extractParameters(this.process_params));

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

@@ -786 +786 @@
 
         constructor.setSiteHome(this.site_home);
+        constructor.setLibraryName(this.library_name);
         constructor.setCollectionName(coll_name);
         constructor.setActionType(type);