Skip to content
Permalink
Browse files

correcting display of of value of field job id range + correcting GUI…

…WebServer path
  • Loading branch information...
bnfklm committed Oct 6, 2016
1 parent b296724 commit 860cd1c0646105f180dd3847bef65f9cf47b4653
@@ -97,9 +97,12 @@ public GUIWebServer() {

// Use directory in commontempdir for cache
final File tempDir = FileUtils.getTempDir();
log.debug("GUI using tempdir " + tempDir);
log.debug("GUI using tempdir " + tempDir.getAbsolutePath());
File basedir = tempDir.getAbsoluteFile().getParentFile();
log.debug("GUI using basedir " + basedir);
if(tempDir.isAbsolute()) {
basedir = new File("");
}
log.debug("GUI using basedir " + basedir.getAbsolutePath());
server.setBaseDir(basedir.getAbsolutePath());

File webapps = new File(basedir, "/webapps");
@@ -141,7 +144,7 @@ public GUIWebServer() {

try {
//add the jar file to tomcat
String warfile = new File(basedir, webApps[i]).getAbsolutePath();
String warfile = new File(basedir.getAbsolutePath(), webApps[i]).getAbsolutePath();
StandardContext ctx = (StandardContext) server.addWebapp(webbase, warfile);
if (taglibsScanningDisabled) {
StandardJarScanFilter jarScanFilter = (StandardJarScanFilter) ctx.getJarScanner().getJarScanFilter();
@@ -306,6 +306,7 @@ public HarvestStatusQuery(ServletRequest req) {
}
jobIdRangeList.add(s);
}
this.jobIdRange = jobIdRange;
} catch (NumberFormatException e) {
this.jobIdRange = null;
throw new ArgumentNotValid("Somes values in job ids range are not correct numbers", e);
@@ -611,7 +611,7 @@ status.job.all = All
status.job.done = Done
status.job.failed = Failed
status.job.failed_rejected = Failed (Rejected for Resubmission)
status.job.filters.group1 = Job status {0} Harvest name {1} Start date {2} End date {3} From job ID {4} To job ID {5}
status.job.filters.group1 = Job status {0} Harvest name {1} Start date {2} End date {3} Job ID Range {4}
status.job.filters.group2 = Order {0} Display {1} rows per page.
status.job.filters.group3 = Job status {0} Harvest name {1}
status.job.new = New
@@ -596,7 +596,7 @@ status.job.all = Alle
status.job.done = F\u00E6rdig
status.job.failed = Fejlet
status.job.failed_rejected = Fejlet (\u00D8nskes ikke genstartet)
status.job.filters.group1 = Job status {0} H\u00F8stnings navn {1} Start dato {2} Slut dato {3} Fra job ID {4} Til job ID {5}
status.job.filters.group1 = Job status {0} H\u00F8stnings navn {1} Start dato {2} Slut dato {3} Job ID Range {4}
status.job.filters.group2 = Sortering {0} Vis {1} r\u00E6kker per side.
status.job.filters.group3 = Job status {0} H\u00F8stninge navn {1}
status.job.new = Ny
@@ -603,7 +603,7 @@ status.job.all = Alle
status.job.done = Fertig
status.job.failed = Fehlgeschlagen
status.job.failed_rejected = Fehlgeschlagen (Wiederabsetzung zur\u00FCckgewiesen)
status.job.filters.group1 = Job Status {0} Harvest Name {1} Startdatum {2} Enddatum {3} Von Job ID {4} Zu job ID {5}
status.job.filters.group1 = Job Status {0} Harvest Name {1} Startdatum {2} Enddatum {3} Job ID Range {4}
status.job.filters.group2 = Sortierung {0} Zeige {1} Zeile pro Seite.
status.job.filters.group3 = Job Status {0} Harvest Name {1}
status.job.new = Neu
@@ -606,7 +606,7 @@ status.job.all = Tous
status.job.done = Termin\u00E9
status.job.failed = \u00C9chou\u00E9
status.job.failed_rejected = \u00C9chec de la relance
status.job.filters.group1 = Statut {0} Ensemble \u00E0 collecter {1} Date de d\u00E9but {2} Date de fin {3} ID du job de début {4} ID du job de fin {5}
status.job.filters.group1 = Statut {0} Ensemble \u00E0 collecter {1} Date de d\u00E9but {2} Date de fin {3} Job ID Range {4}
status.job.filters.group2 = Ordre {0} Afficher {1} lignes par page.
status.job.filters.group3 = Statut {0} Ensemble \u00E0 collecter {1}
status.job.new = Nouveau
@@ -586,7 +586,7 @@ status.job.all = Tutti
status.job.done = Completati
status.job.failed = Falliti
status.job.failed_rejected = Falliti (Nessun desidero di risottometterli)
status.job.filters.group1 = Stato del job {0} Il nome della raccolta {1} Ora di inizio {2} Ora di fine {3} Da job ID {4} Al job ID {5}
status.job.filters.group1 = Stato del job {0} Il nome della raccolta {1} Ora di inizio {2} Ora di fine {3} Job ID Range {4}
status.job.filters.group2 = Classificazione {0} Si mostrano {1} righe per ogni pagina.
status.job.filters.group3 = Stato del job {0} Il nome della raccolta {1}
status.job.new = Nuovi

0 comments on commit 860cd1c

Please sign in to comment.
You can’t perform that action at this time.