Skip to content
Snippets Groups Projects
Commit e33f8df2 authored by Andreas Romeyke's avatar Andreas Romeyke
Browse files

- some fixes

parent b4b4402c
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</fr:x_form> </fr:x_form>
</pl:initParameters> </pl:initParameters>
<pl:description>SLUB Technical Metadata Extractor Plugin, using check_it_tiff to validate tiff-files</pl:description> <pl:description>SLUB Technical Metadata Extractor Plugin, using check_it_tiff to validate tiff-files</pl:description>
<pl:version>1.101</pl:version> <pl:version>1.102</pl:version>
<pl:materialType>DIGITAL</pl:materialType> <pl:materialType>DIGITAL</pl:materialType>
<pl:module>Preservation</pl:module> <pl:module>Preservation</pl:module>
<pl:generalType>TASK</pl:generalType> <pl:generalType>TASK</pl:generalType>
......
FROM centos:6.9 FROM centos:6.9
MAINTAINER Andreas Romeyke <romeyke@slub-dresden.de> MAINTAINER Andreas Romeyke <romeyke@slub-dresden.de>
# current could be 0.3.1 or 0.4, because 0.4 is bugfixed version of # current could be 0.3.1 or 0.4.0, because 0.4.0 is bugfixed version of
# checkit_tiff with rules compatible to 0.3.1 based on Handreichung TIFF v1.2 # checkit_tiff with rules compatible to 0.3.1 based on Handreichung TIFF v1.2
# in checkit_tiff 0.4.1 the rules are adapted to Handreichung TIFF v1.3 # in checkit_tiff 0.4.1 the rules are adapted to Handreichung TIFF v1.3
ENV checkit_tiff_current_version=v0.4 ENV checkit_tiff_current_version=v0.4.0
ENV checkit_tiff_upcoming_version=v0.4.1 ENV checkit_tiff_upcoming_version=v0.4.1
ENV checkit_tiff_gitrepository=https://github.com/SLUB-digitalpreservation/checkit_tiff.git ENV checkit_tiff_gitrepository=https://github.com/SLUB-digitalpreservation/checkit_tiff.git
ENV pcre_version=8.41 ENV pcre_version=8.41
......
...@@ -43,23 +43,15 @@ import java.nio.file.*; ...@@ -43,23 +43,15 @@ import java.nio.file.*;
/*public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtractorPlugin { */ /*public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtractorPlugin { */
public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtractorPlugin { public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtractorPlugin {
private static final ExLogger log = ExLogger.getExLogger(SLUBTechnicalMetadataExtractorCheckItTiffPlugin.class); private static final ExLogger log = ExLogger.getExLogger(SLUBTechnicalMetadataExtractorCheckItTiffPlugin.class);
private enum Checkit_tiff_versions { private Map<Checkit_tiff_versions, String> checkit_tiff_binary_path = new HashMap<Checkit_tiff_versions, String>();
current, upcoming private Map<Checkit_tiff_versions, String> checkit_tiff_config_path = new HashMap<Checkit_tiff_versions, String>();
} private Map<Checkit_tiff_versions, Boolean> is_checkit_tiff_valid = new HashMap<Checkit_tiff_versions, Boolean>();
private Map<Checkit_tiff_versions, String> checkit_tiff_binary_path;
private Map<Checkit_tiff_versions, String> checkit_tiff_config_path;
private Map<Checkit_tiff_versions, Boolean> is_checkit_tiff_valid;
private String exiftool_binary_path; private String exiftool_binary_path;
private List<String> extractionErrors = new ArrayList<String>(); private List<String> extractionErrors = new ArrayList<String>();
private List<String> validationLog = new ArrayList<String>(); private List<String> validationLog = new ArrayList<String>();
private Boolean isvalid = false; private Boolean isvalid = false;
private Boolean iswellformed = false; private Boolean iswellformed = false;
//private boolean is_current_checkit_tiff_valid = false;
//private boolean is_upcoming_checkit_tiff_valid = false;
private Map<String,String> attributes = new HashMap<String, String>(); private Map<String,String> attributes = new HashMap<String, String>();
//static final ExLogger log = ExLogger.getExLogger(SLUBTechnicalMetadataExtractorCheckItTiffPlugin.class, ExLogger.VALIDATIONSTACK);
/** constructor */ /** constructor */
public SLUBTechnicalMetadataExtractorCheckItTiffPlugin() { public SLUBTechnicalMetadataExtractorCheckItTiffPlugin() {
log.info("SLUBTechnicalMetadataExtractorCheckItTiffPlugin instantiated"); log.info("SLUBTechnicalMetadataExtractorCheckItTiffPlugin instantiated");
...@@ -67,6 +59,34 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac ...@@ -67,6 +59,34 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac
is_checkit_tiff_valid.put(v, false); is_checkit_tiff_valid.put(v, false);
} }
} }
/** stand alone check, main file to call local installed clamd
* @param args list of files which should be scanned
*/
public static void main(String[] args) {
SLUBTechnicalMetadataExtractorCheckItTiffPlugin plugin = new SLUBTechnicalMetadataExtractorCheckItTiffPlugin();
Map<String, String> initp = new HashMap<String, String>();
// initp.put( "checkit_tiff", "/usr/bin/checkit_tiff");
// initp.put( "config_file", "/etc/checkit_tiff/slub.cfg");
initp.put( "current_checkit_tiff", "/home/romeyke/git/checkit_tiff/build/checkit_tiff");
initp.put( "current_config_file", "/home/romeyke/git/checkit_tiff/example_configs/cit_tiff6_baseline_SLUBrelaxed.cfg");
initp.put( "upcoming_checkit_tiff", "/home/romeyke/git/checkit_tiff/build/checkit_tiff");
initp.put( "upcoming_config_file", "/home/romeyke/git/checkit_tiff/example_configs/cit_tiff6_baseline_SLUBrelaxed.cfg");
initp.put( "exiftool", "/usr/bin/exiftool");
plugin.initParams( initp );
System.out.println("Agent: '" + plugin.getAgent() + "'");
System.out.println();
for (String file : args) {
try {
plugin.extract(file);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("RESULT: " + plugin.isValid());
System.out.println("ERRORMESSAGE: " + plugin.getExtractionErrors());
}
}
/** init params to configure the plugin via xml forms /** init params to configure the plugin via xml forms
* @param initp parameter map * @param initp parameter map
*/ */
...@@ -76,8 +96,6 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac ...@@ -76,8 +96,6 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac
this.checkit_tiff_config_path.put(Checkit_tiff_versions.current, initp.get("current_config_file").trim()); this.checkit_tiff_config_path.put(Checkit_tiff_versions.current, initp.get("current_config_file").trim());
this.checkit_tiff_config_path.put(Checkit_tiff_versions.upcoming, initp.get("upcoming_config_file").trim()); this.checkit_tiff_config_path.put(Checkit_tiff_versions.upcoming, initp.get("upcoming_config_file").trim());
this.exiftool_binary_path = initp.get("exiftool").trim(); this.exiftool_binary_path = initp.get("exiftool").trim();
log.info("SLUBTechnicalMetadataExtractorCheckItTiffPlugin instantiated with " log.info("SLUBTechnicalMetadataExtractorCheckItTiffPlugin instantiated with "
+ "(current: " + "(current: "
...@@ -1111,31 +1129,8 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac ...@@ -1111,31 +1129,8 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac
return "image/tiff"; return "image/tiff";
} }
/** stand alone check, main file to call local installed clamd private enum Checkit_tiff_versions {
* @param args list of files which should be scanned current, upcoming
*/
public static void main(String[] args) {
SLUBTechnicalMetadataExtractorCheckItTiffPlugin plugin = new SLUBTechnicalMetadataExtractorCheckItTiffPlugin();
Map<String, String> initp = new HashMap<String, String>();
// initp.put( "checkit_tiff", "/usr/bin/checkit_tiff");
// initp.put( "config_file", "/etc/checkit_tiff/slub.cfg");
initp.put( "current_checkit_tiff", "/home/romeyke/git/checkit_tiff/build/checkit_tiff");
initp.put( "current_config_file", "/home/romeyke/git/checkit_tiff/example_configs/cit_tiff6_baseline_SLUBrelaxed.cfg");
initp.put( "upcoming_checkit_tiff", "/home/romeyke/git/checkit_tiff/build/checkit_tiff");
initp.put( "upcoming_config_file", "/home/romeyke/git/checkit_tiff/example_configs/cit_tiff6_baseline_SLUBrelaxed.cfg");
initp.put( "exiftool", "/usr/bin/exiftool");
plugin.initParams( initp );
System.out.println("Agent: '" + plugin.getAgent() + "'");
System.out.println();
for (String file : args) {
try {
plugin.extract(file);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("RESULT: " + plugin.isValid());
System.out.println("ERRORMESSAGE: " + plugin.getExtractionErrors());
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment