Changeset 24811 for main/trunk/gli

Show
Ignore:
Timestamp:
09.11.2011 21:41:57 (8 years ago)
Author:
ak19
Message:

The message that gets displayed on GLI startup if the PDFBox extension is not present now links to the trunk version unless GLI's PROGRAM_VERSION variable is other than trunk (and is therefore a release number). In this case, the URL in the message will point to the tags early for that release number.

Location:
main/trunk/gli
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/classes/dictionary.properties

    r24800 r24811  
    884884MissingImageMagick.Title:Missing ImageMagick 
    885885#******* MissingPDFBox ******** 
    886 MissingPDFBox.Message:If you wish Greenstone to process PDF documents of version 1.5 and above, then get the PDFBox extension by clicking the download link at http://trac.greenstone.org/browser/gs2-extensions/pdf-box/trunk/pdf-box-java.{0} and install it by unzipping it into your {1} folder. 
     886MissingPDFBox.Message:If you wish Greenstone to process PDF documents of version 1.5 and above, then get the PDFBox extension by clicking the download link at http://trac.greenstone.org/browser/{0}gs2-extensions/pdf-box/trunk/pdf-box-java.{1} and install it by unzipping it into your {2} folder. 
    887887MissingPDFBox.Title:Missing PDFBox extension 
    888888#******** Multiple filename encodings not supported ******* 
  • main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

    r24604 r24811  
    7979    /** The current version of the GLI. 
    8080        * Note: the gs3-release-maker relies on this variable being declared 
    81         * in a line which maches this java regex: 
     81        * in a line which matches this java regex: 
    8282        * ^(.*)String\s*PROGRAM_VERSION\s*=\s*"trunk"; 
    8383        * If change the declaration and it no longer matches the regex, please 
     
    13141314        /** Prints a message informing the user where they can get PDFBox from to process PDF files of v1.5 and greater */ 
    13151315    static private void missingPDFBox(String zipExtension, String extFolder) { 
    1316     WarningDialog dialog = new WarningDialog("warning.MissingPDFBox", Dictionary.get("MissingPDFBox.Title"), Dictionary.get("MissingPDFBox.Message", new String[]{zipExtension, extFolder}), null, false); 
     1316    // point to the correct version of the PDFBox extension for this Greenstone release 
     1317    String releaseTag = ""; 
     1318    if(!PROGRAM_VERSION.equals("trunk")) { // assume it's a release version 
     1319        releaseTag = "main/tags/"+PROGRAM_VERSION+"/"; 
     1320    } 
     1321 
     1322    WarningDialog dialog = new WarningDialog("warning.MissingPDFBox", Dictionary.get("MissingPDFBox.Title"), Dictionary.get("MissingPDFBox.Message", new String[]{releaseTag, zipExtension, extFolder}), null, false); 
    13171323        dialog.display(); 
    13181324        dialog.dispose();