From 40a9c545320e1bca07a9350064dcd5ffc9557c46 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Mon, 20 May 2013 13:27:06 -0400 Subject: [PATCH] Progress on VUFIND-659: force SolrMarc to use UTC. --- import-marc.bat | 2 +- import-marc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/import-marc.bat b/import-marc.bat index dc1ba203a38..711c49ab6ee 100644 --- a/import-marc.bat +++ b/import-marc.bat @@ -112,7 +112,7 @@ set JAR_FILE=%VUFIND_HOME%\import\SolrMarc.jar rem ##################################################### rem # Execute Importer rem ##################################################### -set RUN_CMD=%JAVA% %INDEX_OPTIONS% -Dsolr.core.name=%SOLRCORE% %EXTRA_SOLRMARC_SETTINGS% -jar %JAR_FILE% %PROPERTIES_FILE% %1 +set RUN_CMD=%JAVA% %INDEX_OPTIONS% -Duser.timezone=UTC -Dsolr.core.name=%SOLRCORE% %EXTRA_SOLRMARC_SETTINGS% -jar %JAR_FILE% %PROPERTIES_FILE% %1 echo Now Importing %1 ... echo %RUN_CMD% %RUN_CMD% diff --git a/import-marc.sh b/import-marc.sh index 9f2b3a8eb35..0c34e683c62 100755 --- a/import-marc.sh +++ b/import-marc.sh @@ -136,7 +136,7 @@ MARC_FILE=`basename $1` # Execute Importer ##################################################### -RUN_CMD="$JAVA $INDEX_OPTIONS -Dsolr.core.name=$SOLRCORE $EXTRA_SOLRMARC_SETTINGS -jar $JAR_FILE $PROPERTIES_FILE $MARC_PATH/$MARC_FILE" +RUN_CMD="$JAVA $INDEX_OPTIONS -Duser.timezone=UTC -Dsolr.core.name=$SOLRCORE $EXTRA_SOLRMARC_SETTINGS -jar $JAR_FILE $PROPERTIES_FILE $MARC_PATH/$MARC_FILE" echo "Now Importing $1 ..." # solrmarc writes log messages to stderr, write RUN_CMD to the same place echo "`date '+%h %d, %H:%M:%S'` $RUN_CMD" >&2 -- GitLab