- Timestamp:
- 2020-06-12T23:47:19+12:00 (4 years ago)
- Location:
- main/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r33015 r34158 234 234 command_parts_list.add("-collectdir"); 235 235 command_parts_list.add(getCollectDirectory()); // <../collect/> 236 } else { // actually this should work in local Greenstone case too: 237 command_parts_list.add("-library_name"); 238 String library_servlet_name = Configuration.servlet_path; 239 if(library_servlet_name.startsWith("/")) { 240 library_servlet_name = library_servlet_name.substring(1); 241 } 242 command_parts_list.add(library_servlet_name); 236 243 } 237 244 … … 291 298 import_list.add(getCollectDirectory()); 292 299 } 300 // import.pl does not at present need to know the library/servlet_path 301 // whether in a remote or local GS server situation 293 302 294 303 String[] import_options = collection.import_options.getValues(); … … 338 347 build_list.add("-collectdir"); 339 348 build_list.add(getCollectDirectory()); 349 } else { // actually this should work in local Greenstone case too: 350 build_list.add("-library_name"); 351 String library_servlet_name = Configuration.servlet_path; 352 if(library_servlet_name.startsWith("/")) { 353 library_servlet_name = library_servlet_name.substring(1); 354 } 355 build_list.add(library_servlet_name); 340 356 } 341 357 -
main/trunk/greenstone2/bin/script/full-rebuild.pl
r34128 r34158 131 131 # we want buildcol.pl to send it to activate if running buildcol.pl with -activate 132 132 # And we want activate.pl to get it if running activate.pl 133 $build_dir= shift @argv;134 push(@buildcol_argv,$arg,$ build_dir);135 push(@activate_argv,$arg,$ build_dir);133 my $library_info = shift @argv; 134 push(@buildcol_argv,$arg,$library_info); 135 push(@activate_argv,$arg,$library_info); 136 136 } 137 137 elsif ($arg =~ "-OIDtype") { -
main/trunk/greenstone2/bin/script/incremental-rebuild.pl
r31397 r34158 105 105 push(@buildcol_argv,$buildcol_arg,$buildcol_val); 106 106 } 107 elsif ($arg eq "-library_url" || $arg eq "-library_name") { 108 # only makes sense in buildcol.pl as -activate could 109 # have been passed in then. And if so, then activate.pl will be 110 # called by buildcol.pl which will pass on library_url/library_name 111 # to activate.pl 112 my $library_info = shift @argv; 113 push(@buildcol_argv,$arg,$library_info); 114 } 107 115 elsif ($arg =~ "-OIDtype") { 108 116 shift @argv; # skip OIDtype (don't pass OIDtype to buildcol.pl. It's not currently accepted.)
Note:
See TracChangeset
for help on using the changeset viewer.