Changeset 22042
- Timestamp:
- 2010-05-06T10:24:22+12:00 (14 years ago)
- Location:
- gs3-extensions/mat/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/mat/trunk/bin/script/mat-colbuild-download.bat
r18213 r22042 9 9 :: %9 should be the creator 10 10 :: %10 should be the proxy settings 11 12 DEL %8 13 cd %6 11 12 SET COL_NAME=%1 13 SET OAI_URL=%2 14 SET CACHE_DIR=%3 15 SET MAX_RECORDS=%4 16 SET OAI_PREFIX=%5 17 SET GS3_ROOT=%6 18 SET COL_DIR=%7 19 SET LOG_FILE=%8 20 SET CREATOR=%9 21 ::SHIFT 22 ::SET PROXY=%9 23 24 DEL %LOG_FILE% 25 cd %GS3_ROOT% 14 26 CALL gs3-setup.bat 15 27 … … 19 31 cd bin/script/ 20 32 21 perl -S mkcol.pl -gs3mode - collectdir %7 %133 perl -S mkcol.pl -gs3mode -buildtype lucene -collectdir %COL_DIR% %COL_NAME% 22 34 23 35 :: need to ensure that OAIPLUG is included 24 36 :: hack the model collection to inclde it 25 echo % 1 %2 %3 %4 %5 %6 %7 %8 >> %837 echo %COL_NAME% %OAI_URL% %CACHE_DIR% %MAX_RECORDS% %OAI_PREFIX% %GS3_ROOT% %COL_DIR% %LOG_FILE% >> %LOG_FILE% 26 38 27 if not exist % 3goto else28 RMDIR /S /Q % 339 if not exist %CACHE_DIR% goto else 40 RMDIR /S /Q %CACHE_DIR% 29 41 goto endif 30 42 :else 31 md % 343 md %CACHE_DIR% 32 44 :endif 33 45 34 echo "Away to download OAI" >> % 846 echo "Away to download OAI" >> %LOG_FILE% 35 47 36 echo % 948 echo %CREATOR% 37 49 38 SET _ MyVariable=%950 SET _CREATOR=%CREATOR% 39 51 40 SET _MyVariable=###%_MyVariable%### 41 SET _MyVariable=%_MyVariable:"###=% 42 SET _MyVariable=%_MyVariable:###"=% 43 SET _MyVariable=%_MyVariable:###=% 52 SET _CREATOR=###%_CREATOR%### 53 SET _CREATOR=%_CREATOR:"###=% 54 SET _CREATOR=%_CREATOR:###"=% 55 SET _CREATOR=%_CREATOR:###=% 56 57 echo "Away to run downloadfrom.pl with %_CREATOR%" 44 58 45 perl downloadfrom.pl -download_mode OAI -cache_dir % 3 -url %2 -max_records %4 -metadata_prefix %5 %_MyVariable%59 perl downloadfrom.pl -download_mode OAI -cache_dir %CACHE_DIR% -url %OAI_URL% -max_records %MAX_RECORDS% -metadata_prefix %OAI_PREFIX% %_CREATOR% 46 60 47 61 exit -
gs3-extensions/mat/trunk/bin/script/mat-colbuild.bat
r22023 r22042 1 1 :: %1 should be the collection name 2 :: %2 should be the oai URL 3 :: %3 should be the cache directory 4 :: %4 should be the max records 5 :: %5 should be the OAI metadata prefix 6 :: %6 should be GS3 root 7 :: %7 should be the collection directory 8 :: %8 should be the log file 9 :: %9 should be the hostname:port 2 :: %2 should be the cache directory 3 :: %3 should be GS3 root 4 :: %4 should be the collection directory 5 :: %5 should be the log file 6 :: %6 should be the hostname:port 10 7 11 :: %GS3_ROOT=%6 12 :: %COLLECT_DIR=%7 13 :: %LOG_FILE=%8 8 SET COL_NAME=%1 9 SET CACHE_DIR=%2 10 SET GS3_ROOT=%3 11 SET COL_DIR=%4 12 SET LOG_FILE=%5 13 SET HOST_PORT=%6 14 14 15 15 :: check we are still in the right directories 16 16 17 cd % 617 cd %GS3_ROOT% 18 18 CALL gs3-setup.bat 19 19 … … 24 24 echo "Away to build" 25 25 26 perl build -indextype lucene -site localsite -collectdir %7 -log_events -download file://%3 %1 26 XCOPY %CACHE_DIR%\* %COL_DIR%\%COL_NAME%\import /s /i /y 27 28 perl -S incremental-rebuild.pl -site localsite -collectdir %COL_DIR% %COL_NAME% 27 29 28 30 echo "Build finished ...." … … 38 40 :: :endif 39 41 40 echo "Away to convert from Greenstone 2 to Greenstone 3" >> % 842 echo "Away to convert from Greenstone 2 to Greenstone 3" >> %LOG_FILE% 41 43 echo "Away to convert from Greenstone 2 to Greenstone 3" 42 44 43 cd % 645 cd %GS3_ROOT% 44 46 cd bin/script/ 45 47 46 perl convert_coll_from_gs2.pl -collectdir %7 %148 ::perl convert_coll_from_gs2.pl -collectdir %7 %1 47 49 48 echo "Away to reconfigure Greenstone 3 server" >> % 850 echo "Away to reconfigure Greenstone 3 server" >> %LOG_FILE% 49 51 echo "Away to reconfigure Greenstone 3 server" 50 52 51 53 :: wget -O /tmp/mat5.html "http://localhost:8090/greenstone3/library?a=s&sa=c" 52 wget -O % 3/mat-reconfigure.html "http://%9/greenstone3/library?a=s&sa=c"54 wget -O %CACHE_DIR%/mat-reconfigure.html "http://%HOST_PORT%/greenstone3/library?a=s&sa=c" 53 55 54 echo "Done" >> % 856 echo "Done" >> %LOG_FILE% 55 57 echo "Done" 56 58 -
gs3-extensions/mat/trunk/src/org/greenstone/mat/servlet/MatServlet.java
r22041 r22042 39 39 private String proxyHostContent = ""; 40 40 private String proxyPortContent = ""; 41 //private String collection_creator = "";41 private String collection_creator = ""; 42 42 private String proxyUserName= ""; 43 43 private String proxyUserPassword = ""; … … 561 561 alist.add(collectDir); 562 562 alist.add(logFile); 563 //alist.add(collection_creator);563 alist.add(collection_creator); 564 564 alist.add(proxy_settings); 565 565 String[] arrays = new String[alist.size()];
Note:
See TracChangeset
for help on using the changeset viewer.