slub.team team mailing list archive
-
slub.team team
-
Mailing list archive
-
Message #00069
[Merge] lp:~henning-gerhardt/goobi-production/bug-937795 into lp:goobi-production
Henning Gerhardt has proposed merging lp:~henning-gerhardt/goobi-production/bug-937795 into lp:goobi-production.
Requested reviews:
Ralf Claussnitzer (ralf-claussnitzer)
Related bugs:
Bug #937795 in Goobi.Production: "Code cleanup: remove commented out code"
https://bugs.launchpad.net/goobi-production/+bug/937795
For more details, see:
https://code.launchpad.net/~henning-gerhardt/goobi-production/bug-937795/+merge/94168
--
https://code.launchpad.net/~henning-gerhardt/goobi-production/bug-937795/+merge/94168
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
=== modified file 'src/de/sub/goobi/beans/Benutzer.java'
--- src/de/sub/goobi/beans/Benutzer.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/Benutzer.java 2012-02-22 14:09:22 +0000
@@ -58,8 +58,6 @@
private String css;
private Set<Benutzereigenschaft> eigenschaften;
- // private String lastFilter = null;
-
public Benutzer() {
benutzergruppen = new HashSet<Benutzergruppe>();
projekte = new HashSet<Projekt>();
@@ -322,7 +320,6 @@
Ldap myldap = new Ldap();
return myldap.isUserPasswordCorrect(this, inPasswort);
} else {
- // return passwort.equals(inPasswort);
DesEncrypter encrypter = new DesEncrypter();
String encoded = encrypter.encrypt(inPasswort);
return passwort.equals(encoded);
=== modified file 'src/de/sub/goobi/beans/Prozess.java'
--- src/de/sub/goobi/beans/Prozess.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/Prozess.java 2012-02-22 14:09:22 +0000
@@ -668,7 +668,6 @@
checkForMetadataFile();
/* prüfen, welches Format die Metadaten haben (Mets, xstream oder rdf */
String type = MetadatenHelper.getMetaFileType(getMetadataFilePath());
- // createBackupFile(getNumberOfBackups());
myLogger.debug("current meta.xml file type for id " + getId() + ": " + type);
Fileformat ff = null;
if (type.equals("metsmods")) {
@@ -734,14 +733,12 @@
if (!f.exists()) {
// TODO: diese Meldung als Fehlermeldung direkt nach dem Neuanlegen???
- // Helper.setFehlerMeldung(Helper.getTranslation("metadataFileNotFound"), f.getAbsolutePath());
myLogger.warn(Helper.getTranslation("metadataFileNotFound") + f.getAbsolutePath());
storeDefaultMetaFile(f);
}
}
private void storeDefaultMetaFile(File f) throws IOException {
- // boolean ok = false;
/* wenn Verzeichnis angelegt wurde, jetzt die xml-Datei anlegen */
File fstandard = new java.io.File(help.getGoobiDataDirectory() + "standard.xml");
=== modified file 'src/de/sub/goobi/beans/Schritt.java'
--- src/de/sub/goobi/beans/Schritt.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/Schritt.java 2012-02-22 14:09:22 +0000
@@ -52,7 +52,6 @@
private Date bearbeitungsende;
private Integer editType;
private Benutzer bearbeitungsbenutzer;
- // private Integer typ;
private short homeverzeichnisNutzen;
private boolean typMetadaten = false;
@@ -314,14 +313,6 @@
this.titel = titel;
}
- // public Integer getTyp() {
- // return typ;
- // }
- //
- // public void setTyp(Integer typ) {
- // this.typ = typ;
- // }
-
public boolean isPanelAusgeklappt() {
return panelAusgeklappt;
}
=== modified file 'src/de/sub/goobi/beans/property/DisplayPropertyList.java'
--- src/de/sub/goobi/beans/property/DisplayPropertyList.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/beans/property/DisplayPropertyList.java 2012-02-22 14:09:22 +0000
@@ -323,17 +323,6 @@
return containers;
}
- // public List<PropertyTemplate> getPropertiesForContainer() {
- // List<PropertyTemplate> pl = getPropertyTemplatesAsList();
- // List<PropertyTemplate> answer = new ArrayList<PropertyTemplate>();
- // for (PropertyTemplate pt : pl) {
- // if (pt.getContainer() == currentContainer) {
- // answer.add(pt);
- // }
- // }
- // return answer;
- // }
-
public List<PropertyTemplate> getSortedProperties() {
List<PropertyTemplate> answer = getPropertyTemplatesAsList();
Comparator<PropertyTemplate> comp = new CompareProps();
=== modified file 'src/de/sub/goobi/config/ConfigOpac.java'
--- src/de/sub/goobi/config/ConfigOpac.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/config/ConfigOpac.java 2012-02-22 14:09:22 +0000
@@ -37,7 +37,7 @@
private static String configPfad;
public ConfigOpac() throws IOException {
-// AbstractConfiguration.setDefaultListDelimiter('&');
+
configPfad = new Helper().getGoobiConfigDirectory() + "opac.xml";
if (!(new File(configPfad)).exists())
=== modified file 'src/de/sub/goobi/config/ConfigOpacCatalogue.java'
--- src/de/sub/goobi/config/ConfigOpacCatalogue.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/config/ConfigOpacCatalogue.java 2012-02-22 14:09:22 +0000
@@ -110,8 +110,6 @@
* aus dem Dom-Node ein JDom-Object machen
* -------------------*/
Document doc = new DOMBuilder().build(myHitlist.getOwnerDocument());
-// myLogger.debug("executeBeautifier(Node)" + doc.getRootElement().getName()
-// + doc.getRootElement().getChildren().size());
/* ---------------------
* Im JDom-Object alle Felder durchlaufen und die notwendigen Ersetzungen vornehmen
@@ -136,7 +134,6 @@
}
/* Ausgabe des überarbeiteten Opac-Ergebnisses */
- //debugMyNode(myHitlist, "D:/temp_opac2.xml");
if (!ConfigMain.getParameter("debugFolder", "").equals("") && new File(ConfigMain.getParameter("debugFolder")).canWrite())
debugMyNode(myHitlist, ConfigMain.getParameter("debugFolder") + "/opacBeautifyAfter.xml");
return myHitlist;
@@ -146,7 +143,7 @@
* Beautifier für ein JDom-Object durchführen
* ================================================================*/
private void executeBeautifierForElement(Element el) {
-// myLogger.debug("executeBeautifier(Node) - ----------------- " + el.getName());
+
for (ConfigOpacCatalogueBeautifier beautifier : beautifySetList) {
Element elementToChange = null;
/* eine Kopie der zu prüfenden Elemente anlegen (damit man darin löschen kann */
=== modified file 'src/de/sub/goobi/export/dms/ExportDms.java'
--- src/de/sub/goobi/export/dms/ExportDms.java 2012-02-15 07:19:55 +0000
+++ src/de/sub/goobi/export/dms/ExportDms.java 2012-02-22 14:09:22 +0000
@@ -280,14 +280,6 @@
public void imageDownload(Prozess myProzess, File benutzerHome, String atsPpnBand, final String ordnerEndung) throws IOException,
InterruptedException, SwapException, DAOException {
- /*
- * -------------------------------- erstmal alle Filter --------------------------------
- */
- // FilenameFilter filterTifDateien = new FilenameFilter() {
- // public boolean accept(File dir, String name) {
- // return name.endsWith(".tif");
- // }
- // };
/*
* -------------------------------- dann den Ausgangspfad ermitteln --------------------------------
=== modified file 'src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java'
--- src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java 2012-02-22 14:09:22 +0000
@@ -98,8 +98,7 @@
*/
@SuppressWarnings("unchecked")
private void RusdmlDocStructPagesAuswerten(DocStruct inStruct) throws DocStructHasNoTypeException, MetadataTypeNotAllowedException {
- // myLogger.info("Typ: " + inStruct.getType().getName());
- // DropUnusedMetadata(inStruct);
+
RusdmlDropMetadata(inStruct);
RusdmlDropPersons(inStruct);
RusdmlUmlauteDemaskieren(inStruct);
@@ -114,8 +113,6 @@
for (Iterator iter = inStruct.getAllChildren().iterator(); iter.hasNext();) {
DocStruct child = (DocStruct) iter.next();
RusdmlDocStructPagesAuswerten(child);
- /* dem DocStruct alle Seiten der Kinder zuweisen */
- // inStruct.getAllReferences("to").addAll(child.getAllReferences("to"));
}
}
}
@@ -140,7 +137,6 @@
if (inStruct.getAllVisibleMetadata() != null) {
List<Metadata> kopie = new ArrayList<Metadata>(inStruct.getAllMetadata());
for (Metadata meta : kopie) {
- // Metadata meta = (Metadata) iter.next();
/*
* -------------------------------- jetzt alle nicht benötigten Metadaten löschen --------------------------------
@@ -165,8 +161,6 @@
inStruct.getAllMetadata().remove(meta);
if (meta.getType().getName().equals("RUSPublicationHouse"))
inStruct.getAllMetadata().remove(meta);
- // if (meta.getType().getName().equals("RUSKeyword"))
- // inStruct.getAllMetadata().remove(meta);
if (meta.getType().getName().equals("ZBLSource"))
inStruct.getAllMetadata().remove(meta);
@@ -261,7 +255,6 @@
List<? extends Metadata> alleMetadaten = phys.getAllMetadataByType(MDTypeForPath);
if (alleMetadaten.size() > 0) {
for (Metadata meta : alleMetadaten) {
- // Metadata meta = (Metadata) iter.next();
meta.setValue(inNeuerWert);
}
} else
@@ -289,205 +282,8 @@
throw new ExportFileException("Exportfehler: Keine PPN digital vorhanden");
RusdmlAddMissingMetadata(inTopStruct, myProzess, PPN);
- // /* --------------------------------
- // * jetzt die fehlenden projektspezifischen Metadaten erg�nzen
- // * --------------------------------*/
- // List alleMissingDaten = cp.getParamList("dmsImport.add");
- // /* standard */
- // if (alleMissingDaten.contains("standard")) {
- // addMissingMetadata_standard(inTopStruct, myProzess);
- // }
- // /* rusdml */
- // if (alleMissingDaten.contains("rusdml")) {
- // addMissingMetadata_Rusdml(inTopStruct, myProzess, PPN);
- // }
- // /* creatorsAll */
- // if (alleMissingDaten.contains("creatorsAll")) {
- // addMissingMetadata_creatorsAll(inTopStruct, myProzess);
- // }
-
}
- /* =============================================================== */
-
- // /**
- // * Metadaten über alle Autoren für oberstes Strukturelement
- // * @param inTopStruct
- // * @param myProzess
- // * @throws ExportFileException
- // * @throws UghHelperException
- // */
- // private void addMissingMetadata_creatorsAll(DocStruct inTopStruct,
- // Prozess myProzess)
- // throws ExportFileException, UghHelperException {
- // MetadataType mdt = ughHelp.getMetadataType(myPrefs, "CreatorsAllOrigin");
- //
- // /* --------------------------------
- // * wenn das Feld CreatorsAllOrigin schon existiert, sofort raus
- // * --------------------------------*/
- // if (inTopStruct.getAllMetadataByType(mdt) != null)
- // return;
- //
- // /* --------------------------------
- // * Metadaten erzeugen
- // * --------------------------------*/
- // Metadata mdCreators = new Metadata();
- // mdCreators.setType(mdt);
- // mdCreators.setValue("");
- //
- // /* --------------------------------
- // * alle beteiligten Personen durchlaufen und in das Feld übernehmen
- // * --------------------------------*/
- // if (inTopStruct.getAllPersons() != null) {
- // for (Iterator iter = inTopStruct.getAllPersons().iterator();
- // iter.hasNext();) {
- // Person p = (Person) iter.next();
- // String tempname = (mdCreators.getValue().length() > 0 ? "; " : "");
- // tempname += p.getLastname() + ", " + p.getFirstname();
- // mdCreators.setValue(mdCreators.getValue() + tempname);
- // }
- // }
- //
- // /* --------------------------------
- // * das Metadatum dem TopStruct zuweisen
- // * --------------------------------*/
- // try {
- // inTopStruct.addMetadata(mdCreators);
- // } catch (Exception e) {
- // throw new ExportFileException(e.getMessage());
- // }
- // }
- /* =============================================================== */
-
- // /**
- // * Metadaten über alle Autoren für oberstes Strukturelement
- // * @param inTopStruct
- // * @param myProzess
- // * @throws ExportFileException
- // * @throws UghHelperException
- // */
- // private void addMissingMetadata_standard(DocStruct inTopStruct, Prozess
- // myProzess)
- // throws ExportFileException, UghHelperException {
- //
- // /* --------------------------------
- // * Metadatentypen ermitteln
- // * --------------------------------*/
- // MetadataType mdt_PublicationYear = ughHelp.getMetadataType(myPrefs,
- // "PublicationYear");
- // MetadataType mdt_PublisherName = ughHelp.getMetadataType(myPrefs,
- // "PublisherName");
- // MetadataType mdt_PlaceOfPublication = ughHelp.getMetadataType(myPrefs,
- // "PlaceOfPublication");
- // MetadataType mdt_CatalogIDSource = ughHelp.getMetadataType(myPrefs,
- // "CatalogIDSource");
- // MetadataType mdt_copyrightimageset = ughHelp.getMetadataType(myPrefs,
- // "copyrightimageset");
- // MetadataType mdt_imagedescr = ughHelp.getMetadataType(myPrefs,
- // "imagedescr");
- // MetadataType mdt_shelfmarkarchiveimageset = ughHelp
- // .getMetadataType(myPrefs, "shelfmarkarchiveimageset");
- // MetadataType mdt_mediumsource = ughHelp.getMetadataType(myPrefs,
- // "mediumsource");
- //
- // /* --------------------------------
- // * Metadaten erzeugen für logical Topstruct
- // * --------------------------------*/
- // Metadata md_PublicationYear = new Metadata();
- // md_PublicationYear.setType(mdt_PublicationYear);
- // md_PublicationYear.setValue(WerkstueckEigenschaftErmitteln(myProzess,
- // "Erscheinungsjahr"));
- // Metadata md_PublisherName = new Metadata();
- // md_PublisherName.setType(mdt_PublisherName);
- // md_PublisherName.setValue(WerkstueckEigenschaftErmitteln(myProzess,
- // "Verlag"));
- // Metadata md_PlaceOfPublication = new Metadata();
- // md_PlaceOfPublication.setType(mdt_PlaceOfPublication);
- // md_PlaceOfPublication.setValue(WerkstueckEigenschaftErmitteln(myProzess,
- // "Erscheinungsort"));
- // Metadata md_CatalogIDSource = new Metadata();
- // md_CatalogIDSource.setType(mdt_CatalogIDSource);
- // md_CatalogIDSource.setValue(ScanvorlagenEigenschaftErmitteln(myProzess,
- // "PPN analog"));
- // if (!md_CatalogIDSource.getValue().startsWith("PPN"))
- // md_CatalogIDSource.setValue("PPN" + md_CatalogIDSource.getValue());
- //
- // /* --------------------------------
- // * Metadaten erzeugen für physical Topstruct
- // * --------------------------------*/
- // Metadata md_copyrightimageset = new Metadata();
- // md_copyrightimageset.setType(mdt_copyrightimageset);
- // md_copyrightimageset.setValue(WerkstueckEigenschaftErmitteln(myProzess,
- // "Artist"));
- // Metadata md_imagedescr = new Metadata();
- // md_imagedescr.setType(mdt_imagedescr);
- // TiffHeader tiff = new TiffHeader(myProzess);
- // md_imagedescr.setValue(tiff.getImageDescription());
- // Metadata md_shelfmarkarchiveimageset = new Metadata();
- // md_shelfmarkarchiveimageset.setType(mdt_shelfmarkarchiveimageset);
- // md_shelfmarkarchiveimageset.setValue(ScanvorlagenEigenschaftErmitteln(myProzess,
- // "Signatur"));
- // Metadata md_mediumsource = new Metadata();
- // md_mediumsource.setType(mdt_mediumsource);
- // md_mediumsource.setValue("Book");
- //
- // /* --------------------------------
- // * die Metadaten dem TopStruct zuweisen
- // * --------------------------------*/
- // try {
- // if (inTopStruct.getAllMetadataByType(mdt_PublicationYear) == null)
- // inTopStruct.addMetadata(md_PublicationYear);
- // if (inTopStruct.getAllMetadataByType(mdt_PublisherName) == null)
- // inTopStruct.addMetadata(md_PublisherName);
- // if (inTopStruct.getAllMetadataByType(mdt_PlaceOfPublication) == null)
- // inTopStruct.addMetadata(md_PlaceOfPublication);
- // if (inTopStruct.getAllMetadataByType(mdt_CatalogIDSource) == null)
- // inTopStruct.addMetadata(md_CatalogIDSource);
- // } catch (Exception e) {
- // throw new ExportFileException(e.getMessage());
- // }
- //
- // /* --------------------------------
- // * die Metadaten dem BoundBook zuweisen
- // * --------------------------------*/
- // DocStruct boundBook = mydocument.getPhysicalDocStruct();
- // try {
- // if (boundBook.getAllMetadataByType(mdt_copyrightimageset) == null)
- // boundBook.addMetadata(md_copyrightimageset);
- // if (boundBook.getAllMetadataByType(mdt_imagedescr) == null)
- // boundBook.addMetadata(md_imagedescr);
- // if (boundBook.getAllMetadataByType(mdt_shelfmarkarchiveimageset) == null)
- // boundBook.addMetadata(md_shelfmarkarchiveimageset);
- // if (boundBook.getAllMetadataByType(mdt_mediumsource) == null)
- // boundBook.addMetadata(md_mediumsource);
- // } catch (Exception e) {
- // throw new ExportFileException(e.getMessage());
- // }
- // }
- /* =============================================================== */
-
- // /**
- // * alle nicht benötigten Metadaten rauswerfen
- // * @param inStruct
- // * @throws MetadataTypeNotAllowedException
- // * @throws DocStructHasNoTypeException
- // */
- // @SuppressWarnings("unchecked")
- // private void DropUnusedMetadata(DocStruct inStruct) throws
- // DocStructHasNoTypeException,
- // MetadataTypeNotAllowedException {
- //
- //
- // if (inStruct.getAllVisibleMetadata() != null) {
- // List alleDropDaten = cp.getParamList("dmsImport.drop");
- // if (alleDropDaten.contains("rusdml")) {
- // DropMetadata_Rusdml(inStruct);
- // DropPersons_Rusdml(inStruct);
- // }
- // }
- // }
- /* =============================================================== */
-
/**
* Fehlende Metadaten für Rusdml erg�nzen
*
@@ -578,7 +374,6 @@
List<Metadata> kopie = inStruct.getAllMetadata();
if (kopie != null) {
for (Metadata meta : kopie) {
- // Metadata meta = (Metadata) iter.next();
/* in den Metadaten die Umlaute entfernen */
RusdmlUmlauteDemaskieren1(meta);
}
=== modified file 'src/de/sub/goobi/export/download/ExportMets.java'
--- src/de/sub/goobi/export/download/ExportMets.java 2012-02-15 07:19:55 +0000
+++ src/de/sub/goobi/export/download/ExportMets.java 2012-02-22 14:09:22 +0000
@@ -267,7 +267,6 @@
pointer = vp.replace(anchor);
mm.setMptrAnchorUrl(pointer);
- // if (!ConfigMain.getParameter("ImagePrefix", "\\d{8}").equals("\\d{8}")) {
try {
MetadatenImagesHelper mih = new MetadatenImagesHelper(myPrefs, dd);
ArrayList<String> images = mih.getImageFiles(myProzess);
@@ -277,7 +276,6 @@
} catch (InvalidImagesException e) {
myLogger.error(e);
}
- // }
mm.write(targetFileName);
}
}
=== modified file 'src/de/sub/goobi/export/download/Multipage.java'
--- src/de/sub/goobi/export/download/Multipage.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/export/download/Multipage.java 2012-02-22 14:09:22 +0000
@@ -62,23 +62,11 @@
private static final Logger myLogger = Logger.getLogger(Multipage.class);
Helper help = new Helper();
-
-
-// private static PlanarImage readAsPlanarImage(String filename) {
-// return JAI.create("fileload", filename);
-// }
-
-
-
private void create(Prozess inProzess) throws IOException, InterruptedException, SwapException, DAOException {
/* alle tifs durchlaufen */
String pfad = inProzess.getImagesDirectory();
File dir = new File(pfad);
-// FilenameFilter filter = new FilenameFilter() {
-// public boolean accept(File dir, String name) {
-// return name.endsWith(".tif");
-// }
-// };
+
String[] dateien = dir.list(MetadatenImagesHelper.filter);
/* keine Tifs vorhanden, also raus */
@@ -89,10 +77,8 @@
/* alle Bilder in ein Array übernehmen */
RenderedImage image[] = new PlanarImage[dateien.length];
- //Vector<PlanarImage> vector = new Vector<PlanarImage>();
for (int i = 0; i < dateien.length; i++) {
myLogger.debug(pfad + dateien[i]);
- //vector.add(JAI.create("fileload", pfad + dateien[i]));
image[i] = JAI.create("fileload", pfad + dateien[i]);
}
myLogger.debug("Bilder durchlaufen");
=== modified file 'src/de/sub/goobi/export/download/TiffHeader.java'
--- src/de/sub/goobi/export/download/TiffHeader.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/export/download/TiffHeader.java 2012-02-22 14:09:22 +0000
@@ -44,17 +44,6 @@
* @version 1.00 - 12.04.2005
*/
public class TiffHeader {
- // private String Haupttitel="";
- // private String Autor="";
- // private String DocType="";
- // private String PPNdigital="";
- // private String Band="";
- // private String TSL="";
- // private String ATS="";
- // private String ISSN="";
- // private String Jahr="";
- // private String Ort="";
- // private String Verlag="";
private String Artist = "";
private String tifHeader_imagedescription = "";
@@ -68,45 +57,16 @@
Werkstueck myWerkstueck = (Werkstueck) inProzess.getWerkstueckeList().get(0);
if (myWerkstueck.getEigenschaftenSize() > 0) {
for (Werkstueckeigenschaft eig : myWerkstueck.getEigenschaftenList()) {
- // Werkstueckeigenschaft eig = (Werkstueckeigenschaft) iter.next();
if (eig.getTitel().equals("TifHeaderDocumentname"))
tifHeader_documentname = eig.getWert();
if (eig.getTitel().equals("TifHeaderImagedescription"))
tifHeader_imagedescription = eig.getWert();
- // if (eig.getTitel().equals("PPN digital"))
- // PPNdigital = eig.getWert();
- // if (eig.getTitel().equals("Band") && Band == null)
- // Band = eig.getWert();
- // if (eig.getTitel().equals("BandTiffheader"))
- // Band = eig.getWert();
- // if (eig.getTitel().equals("TSL"))
- // TSL = eig.getWert();
- // if (eig.getTitel().equals("ATS"))
- // ATS = eig.getWert();
- // if (eig.getTitel().equals("ISSN"))
- // ISSN = eig.getWert();
- // if (eig.getTitel().equals("DocType"))
- // DocType = eig.getWert();
if (eig.getTitel().equals("Artist"))
Artist = eig.getWert();
- // if (eig.getTitel().equals("Erscheinungsort"))
- // Ort = eig.getWert();
- // if (eig.getTitel().equals("Verlag"))
- // Verlag = eig.getWert();
- // if (eig.getTitel().equals("Autor"))
- // Autor = eig.getWert();
- // if (eig.getTitel().equals("Haupttitel"))
- // Haupttitel = eig.getWert();
- // if (eig.getTitel().equals("Erscheinungsjahr"))
- // Jahr = eig.getWert();
}
}
-
- // /* Die Bandnummer auf vier Stellen ändern */
- // if (Band != null && Band.length() < 4)
- // Band = "0000".substring(Band.length()) + Band;
}
}
@@ -115,98 +75,6 @@
*/
public String getImageDescription() {
return tifHeader_imagedescription;
- // StringBuffer strBuf = new StringBuffer();
- // strBuf.append("|<RUSDML>|");
- //
- // /* --------------------------------
- // * Tiff-Header für eine Zeitschrift
- // * --------------------------------*/
- // if (DocType.equals("periodical")) {
- // if (Haupttitel != null && Haupttitel.length() > 0)
- // strBuf.append("<HAUPTTITEL>|<" + Haupttitel + ">|");
- // if (Verlag != null && Verlag.length() > 0)
- // strBuf.append("<VERLAG>|<" + Verlag + ">|");
- // if (Jahr != null && Jahr.length() > 0)
- // strBuf.append("<ERSCHEINUNGSJAHR>|<" + Jahr + ">|");
- // if (Ort != null && Ort.length() > 0)
- // strBuf.append("<ERSCHEINUNGSORT>|<" + Ort + ">|");
- // if (TSL != null && TSL.length() > 0)
- // strBuf.append("<TSL>|<" + TSL + ">|");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append("<PPN>|<" + PPNdigital + ">|");
- // if (ISSN != null && ISSN.length() > 0)
- // strBuf.append("<ISSN>|<" + ISSN + ">|");
- // if (Band != null && Band.length() > 0)
- // strBuf.append("<BAND>|<" + Band + ">|");
- // }
- //
- // /* --------------------------------
- // * Tiff-Header für eine Zeitschriftenreihe
- // * --------------------------------*/
- // if (DocType.equals("periodicalrow")) {
- // if (Haupttitel != null && Haupttitel.length() > 0)
- // strBuf.append("<HAUPTTITEL>|<" + Haupttitel + ">|");
- // if (Autor != null && Autor.length() > 0)
- // strBuf.append("<AUTOR>|<" + Autor + ">|");
- // if (Verlag != null && Verlag.length() > 0)
- // strBuf.append("<VERLAG>|<" + Verlag + ">|");
- // if (Jahr != null && Jahr.length() > 0)
- // strBuf.append("<ERSCHEINUNGSJAHR>|<" + Jahr + ">|");
- // if (Ort != null && Ort.length() > 0)
- // strBuf.append("<ERSCHEINUNGSORT>|<" + Ort + ">|");
- // if (TSL != null && TSL.length() > 0)
- // strBuf.append("<TSL>|<" + TSL + ">|");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append("<PPN>|<" + PPNdigital + ">|");
- // if (ISSN != null && ISSN.length() > 0)
- // strBuf.append("<ISSN>|<" + ISSN + ">|");
- // if (Band != null && Band.length() > 0)
- // strBuf.append("<BAND>|<" + Band + ">|");
- // }
- //
- // /* --------------------------------
- // * Tiff-Header für eine Monographie
- // * --------------------------------*/
- // if (DocType.equals("monograph")) {
- // if (Autor != null && Autor.length() > 0)
- // strBuf.append("<AUTOR>|<" + Autor + ">|");
- // if (Haupttitel != null && Haupttitel.length() > 0)
- // strBuf.append("<HAUPTTITEL>|<" + Haupttitel + ">|");
- // if (Verlag != null && Verlag.length() > 0)
- // strBuf.append("<VERLAG>|<" + Verlag + ">|");
- // if (Jahr != null && Jahr.length() > 0)
- // strBuf.append("<ERSCHEINUNGSJAHR>|<" + Jahr + ">|");
- // if (Ort != null && Ort.length() > 0)
- // strBuf.append("<ERSCHEINUNGSORT>|<" + Ort + ">|");
- // if (ATS != null && ATS.length() > 0)
- // strBuf.append("<ATS>|<" + ATS + ">|");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append("<PPN>|<" + PPNdigital + ">|");
- // }
- //
- // /* --------------------------------
- // * Tiff-Header für ein Mehrb�ndiges Werk
- // * --------------------------------*/
- // if (DocType.equals("multivolume")) {
- // if (Autor != null && Autor.length() > 0)
- // strBuf.append("<AUTOR>|<" + Autor + ">|");
- // if (Haupttitel != null && Haupttitel.length() > 0)
- // strBuf.append("<HAUPTTITEL>|<" + Haupttitel + ">|");
- // if (Verlag != null && Verlag.length() > 0)
- // strBuf.append("<VERLAG>|<" + Verlag + ">|");
- // if (Jahr != null && Jahr.length() > 0)
- // strBuf.append("<ERSCHEINUNGSJAHR>|<" + Jahr + ">|");
- // if (Ort != null && Ort.length() > 0)
- // strBuf.append("<ERSCHEINUNGSORT>|<" + Ort + ">|");
- // if (ATS != null && ATS.length() > 0)
- // strBuf.append("<ATS>|<" + ATS + ">|");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append("<PPN>|<" + PPNdigital + ">|");
- // if (Band != null && Band.length() > 0)
- // strBuf.append("<BAND>|<" + Band + ">|");
- // }
- //
- // return strBuf.toString();
}
/**
@@ -214,21 +82,6 @@
*/
private String getDocumentName() {
return tifHeader_documentname;
- // StringBuffer strBuf = new StringBuffer();
- // if (DocType.equals("Monographie")) {
- // if (ATS != null && ATS.length() > 0)
- // strBuf.append(ATS + "_");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append(PPNdigital + "_");
- // } else {
- // if (TSL != null && TSL.length() > 0)
- // strBuf.append(TSL + "_");
- // if (PPNdigital != null && PPNdigital.length() > 0)
- // strBuf.append("PPN" + PPNdigital + "_");
- // if (Band != null && Band.length() > 0)
- // strBuf.append(Band);
- // }
- // return strBuf.toString();
}
/**
@@ -245,18 +98,15 @@
strBuf.append("#" + lineBreak);
strBuf.append("# Configuration file for TIFFWRITER.pl" + lineBreak);
strBuf.append("#" + lineBreak);
-// strBuf.append("# - has to be in tif folder"
-// + lineBreak);
+
strBuf.append("# - overwrites tiff-tags." + lineBreak);
strBuf.append("#" + lineBreak);
- // strBuf.append("#CheckNames=no" + lineBreak);
- // strBuf.append("#CheckNames=yes" + lineBreak);
+
strBuf.append("#" + lineBreak);
strBuf.append("Artist=" + Artist + lineBreak);
strBuf.append("Documentname=" + getDocumentName() + lineBreak);
strBuf.append("ImageDescription=" + getImageDescription() + lineBreak);
- // strBuf.append("#ResolutionX=200" + lineBreak);
- // strBuf.append("#ResolutionY=203" + lineBreak);
+
return strBuf.toString();
}
=== modified file 'src/de/sub/goobi/forms/AdministrationForm.java'
--- src/de/sub/goobi/forms/AdministrationForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/AdministrationForm.java 2012-02-22 14:09:22 +0000
@@ -26,9 +26,6 @@
//TODO: Dont use Iterators, use for loop instead.
//TODO: This need to be refactored into several classes, one for each distict functionality
-//import groovy.lang.Binding;
-//import groovy.lang.GroovyShell;
-
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
@@ -85,9 +82,6 @@
private String passwort;
private boolean istPasswortRichtig = false;
private boolean rusFullExport = false;
- //TODO: Remove this
- //private boolean olmsZaehlung = false;
- //private String myPlugin;
public final static String DIRECTORY_SUFFIX = "_tif";
@@ -157,120 +151,6 @@
/*
* #####################################################
- * ##################################################### ## ## Scripte über
- * separaten Classloader laden ##
- * #####################################################
- * ####################################################
- */
-
- /*
- public void startPlugin() {
- ConfigMain conf = new ConfigMain();
- File file = new File(conf.getParameter("pluginFolder", File.separator));
- try {
- URL url = file.toURL();
- URL[] urls = new URL[] { url };
-
- ClassLoader servletClassLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader cl = new URLClassLoader(urls, servletClassLoader);
- // cl.clearAssertionStatus();
- // cl.setClassAssertionStatus("de.sub.goobi.Plugins." + myPlugin,
- // true);
- Class cls = cl.loadClass("de.sub.goobi.Plugins." + myPlugin);
-
- // run it
- Object objectParameters[] = { new String[] {} };
- Class classParameters[] = { objectParameters[0].getClass() };
- try {
- Method theMethod = cls.getDeclaredMethod("main", classParameters);
- theMethod.invoke(null, objectParameters);
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
- // Static method, no instance needed
- catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- cl = null;
- // GoobiAdminScriptPlugin p = (GoobiAdminScriptPlugin)
- // cls.newInstance();
- // p.start();
- // cl.setClassAssertionStatus("de.sub.goobi.Plugins." + myPlugin,
- // true);
- } catch (MalformedURLException e) {
- Helper.setFehlerMeldung("MalformedURLException: ", e.getMessage());
- } catch (ClassNotFoundException e) {
- Helper.setFehlerMeldung("ClassNotFoundException: ", e.getMessage());
- // } catch (InstantiationException e) {
- // Helper.setFehlerMeldung("InstantiationException: ",
- // e.getMessage());
- } catch (IllegalAccessException e) {
- Helper.setFehlerMeldung("IllegalAccessException: ", e.getMessage());
- }
- Helper.setMeldung("------------------------------------------------------------------");
- Helper.setMeldung("Plugin ausgeführt");
- }
- */
-
- /**
- * Liste der Plugins aus
- * ================================================================
- */
- /*
- public List getMyPluginList() {
- ConfigMain conf = new ConfigMain();
- File dir = new File(conf.getParameter("pluginFolder", File.separator));
- // alle Plugins durchlaufen
- FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name.endsWith(".class"));
- }
- };
- String[] dateien = dir.list(filter);
- if (dateien == null || dateien.length == 0)
- return new ArrayList();
-
- // Klassen nach Namen sortieren und zurückgeben
- List<String> filesDirs = new ArrayList<String>();
- for (String string : dateien)
- filesDirs.add(string.substring(0, string.indexOf(".class")));
- Collections.sort(filesDirs);
- return filesDirs;
- }
- */
-
- /**
- * Getter und Setter für Plugin
- * ================================================================
- */
- /*
- public String getMyPlugin() {
- return myPlugin;
- }
-
- public void setMyPlugin(String myPlugin) {
- this.myPlugin = myPlugin;
- }
- */
-
- /*
- public void GroovyTest() {
- Binding binding = new Binding();
- binding.setVariable("foo", new Integer(2));
- GroovyShell shell = new GroovyShell(binding);
-
- Object value = shell.evaluate("println 'Hello World!'; x = 123; return foo * 10");
- assert value.equals(new Integer(20));
- assert binding.getVariable("x").equals(new Integer(123));
- }
- */
-
- /*
- * #####################################################
* ##################################################### ## ##
* ProzesseDurchlaufen ##
* #####################################################
@@ -281,7 +161,6 @@
ProzessDAO dao = new ProzessDAO();
List<Prozess> auftraege = dao.search("from Prozess");
for (Prozess auf : auftraege) {
-// Prozess auf = (Prozess) iter.next();
dao.save(auf);
}
Helper.setMeldung(null, "", "Elements successful counted");
@@ -292,7 +171,6 @@
ProzessDAO dao = new ProzessDAO();
List<Prozess> auftraege = dao.search("from Prozess");
for (Prozess auf : auftraege) {
-// Prozess auf = (Prozess) iter.next();
try {
auf.setSortHelperDocstructs(zaehlen.getNumberOfUghElements(auf, CountType.DOCSTRUCT));
@@ -318,7 +196,6 @@
//TODO: Try to avoid SQL
List<Schritt> schritte = dao.search("from Schritt where titel='Automatische Generierung der SICI'");
for (Schritt auf : schritte) {
-// Schritt auf = (Schritt) iter.next();
auf.setBenutzergruppen(neueGruppen);
dao.save(auf);
}
@@ -340,58 +217,10 @@
Helper.setMeldung(null, "", "Standard-ruleset successful set");
}
- //TODO: Remove this
- /*
- public void MesskatalogeOrigOrdnerErstellen() throws DAOException {
- // HibernateUtil.clearSession();
- Session session = Helper.getHibernateSession();
- Criteria crit = session.createCriteria(Prozess.class);
-
- Disjunction dis = Expression.disjunction();
- dis.add(Expression.like("titel", "%PPN525606394%"));
- dis.add(Expression.like("titel", "%PPN525616772%"));
- dis.add(Expression.like("titel", "%PPN525614036%"));
- dis.add(Expression.like("titel", "%PPN525615075%"));
- dis.add(Expression.like("titel", "%PPN525616276%"));
- crit.add(dis);
-
- int i = 0;
- for (Iterator iter = crit.list().iterator(); iter.hasNext();) {
- Prozess auf = (Prozess) iter.next();
-
- // Aktion ausführen, bei Fehlern auf offen setzen
- try {
- File ausgang = new File(auf.getImagesTifDirectory());
- File ziel = new File(ausgang.getParent() + File.separator + "orig_" + ausgang.getName());
- CopyFile.copyDirectory(ausgang, ziel);
- } catch (Exception e) {
- Helper.setFehlerMeldung("Fehler bei den Messkatalogen", e);
- return;
- }
-
- Helper.setMeldung(auf.getId() + " - " + auf.getTitel() + " erledigt");
- }
- Helper.setMeldung(null, "", "MesskatalogeOrigOrdnerErstellen gesetzt");
- }
- */
-
- /*
- * #####################################################
- * ##################################################### ## ## LDAP testen
- * ## #####################################################
- * ####################################################
- */
-
-// //TODO: Remove this
-// public void LDAPtest() {
-// Ldap myldap = new Ldap();
-// Helper.setMeldung(null, "", "LDAP-Zugriff erfolgreich: " + myldap.isUserAlreadyExists("enders"));
-// }
-
- /*
- * #####################################################
- * ##################################################### ## ## Passw�rter
- * verschl�sseln ## #####################################################
+ /*
+ * #####################################################
+ * ##################################################### ## ## Passwörter
+ * verschlüsseln ## #####################################################
* ####################################################
*/
@@ -401,7 +230,6 @@
BenutzerDAO dao = new BenutzerDAO();
List<Benutzer> myBenutzer = dao.search("from Benutzer");
for (Benutzer ben : myBenutzer) {
-// Benutzer ben = (Benutzer) iter.next();
String passencrypted = encrypter.encrypt(ben.getPasswort());
ben.setPasswort(passencrypted);
dao.save(ben);
@@ -440,23 +268,6 @@
/*
* #####################################################
- * ##################################################### ## ## Olms-Online -
- * Bände anlegen ## #####################################################
- * ####################################################
- */
- /*
- public void OlmsOnlineBaendeAnlegen() {
- OlmsOnlineProzesseAnlegen oop = new OlmsOnlineProzesseAnlegen();
- try {
- oop.startAnlegen();
- } catch (Exception e) {
- Helper.setFehlerMeldung(null, "Fehler aufgetreten: ", e.getMessage());
- }
- Helper.setMeldung(null, "", "Baende angelegt");
- }
- */
- /*
- * #####################################################
* ##################################################### ## ## Imagepfad
* korrigieren ## #####################################################
* ####################################################
@@ -465,17 +276,9 @@
@SuppressWarnings("unchecked")
public void ImagepfadKorrigieren() throws DAOException {
UghHelper ughhelp = new UghHelper();
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
Criteria crit = session.createCriteria(Prozess.class);
- // crit.createCriteria("projekt", "proj");
- // crit.add(Expression.like("proj.titel", "DigiWunschBuch"));
- //
- // crit.createCriteria("schritte", "steps");
- // crit.add(Expression.and(Expression.eq("steps.reihenfolge", 6),
- // Expression.eq(
- // "steps.bearbeitungsstatus", 1)));
List<Prozess> auftraege = crit.list();
/* alle Prozesse durchlaufen */
@@ -497,25 +300,6 @@
Metadata md = (Metadata) alleMetadaten.get(0);
myLogger.debug(md.getValue());
- // /* --------------------------------
- // * Prozesseigenschaften ermitteln und daraus den
- // Imagepfad errechnen
- // * --------------------------------*/
- // String atsPpnBand =
- // bHelper.WerkstueckEigenschaftErmitteln(p, "ATS")
- // + bHelper.WerkstueckEigenschaftErmitteln(p, "TSL") +
- // "_";
- // String ppn = bHelper.WerkstueckEigenschaftErmitteln(p,
- // "PPN digital");
- // if (!ppn.startsWith("PPN"))
- // ppn = "PPN" + ppn;
- // atsPpnBand += ppn;
- // String bandnummer =
- // bHelper.WerkstueckEigenschaftErmitteln(p, "Band");
- // if (bandnummer != null && bandnummer.length() > 0)
- // atsPpnBand += "_" +
- // bHelper.WerkstueckEigenschaftErmitteln(p, "Band");
- // md.setValue("./" + atsPpnBand + "_tif");
if (SystemUtils.IS_OS_WINDOWS) {
md.setValue("file:/" + p.getImagesDirectory() + p.getTitel().trim() + DIRECTORY_SUFFIX);
} else {
@@ -567,10 +351,6 @@
crit.add(Restrictions.eq("istTemplate", Boolean.valueOf(false)));
crit.createCriteria("projekt", "proj");
crit.add(Restrictions.like("proj.titel", "DigiZeitschriften"));
- // crit.createCriteria("schritte", "steps");
- // crit.add(Expression.and(Expression.eq("steps.reihenfolge", 6),
- // Expression.eq(
- // "steps.bearbeitungsstatus", 1)));
List<Prozess> auftraege = crit.list();
/* alle Prozesse durchlaufen */
@@ -641,7 +421,6 @@
myCollections = new ArrayList<Metadata>(dsFirst.getAllMetadataByType(coltype));
if (myCollections != null && myCollections.size() > 0) {
for (Metadata md : myCollections) {
-// Metadata md = (Metadata) it.next();
if (myKollektionenTitel.contains(md.getValue()))
dsFirst.removeMetadata(md);
else
@@ -693,7 +472,6 @@
Criteria crit = session.createCriteria(Prozess.class);
crit.add(Restrictions.eq("istTemplate", Boolean.valueOf(false)));
crit.add(Restrictions.like("titel", "statjafud%"));
- // crit.add(Expression.like("titel", "statjafud_PPN514401303_1880"));
/* alle Prozesse durchlaufen */
List<Prozess> pl = crit.list();
for (Prozess p : pl) {
@@ -844,55 +622,6 @@
/*
* #####################################################
- * ##################################################### ## ##
- * Tiffheader-Feld aus Tifs auslesen (ob mit PixEdit gearbeitet wurde) ##
- * #####################################################
- * ####################################################
- */
-
- // public void RusDmlBaendeTiffPruefen() throws DAOException, IOException,
- // InterruptedException, SwapException {
- // int counter = 0;
- // /* --------------------------------
- // * erstmal alle Filter
- // * --------------------------------*/
- // FilenameFilter filterTifDateien = new FilenameFilter() {
- // public boolean accept(File dir, String name) {
- // return name.endsWith(".tif");
- // }
- // };
- //
- // Session session = Helper.getHibernateSession();
- // Criteria crit = session.createCriteria(Prozess.class);
- // // crit.add(Expression.like("titel", "%algeilo%"));
- // crit.createCriteria("projekt", "proj");
- // crit.add(Expression.like("proj.titel", "%rusdml%"));
- // List myProzesse = crit.list();
- // for (Iterator iter = myProzesse.iterator(); iter.hasNext();) {
- // Prozess proz = (Prozess) iter.next();
- // File tifOrdner = new File(proz.getImagesTifDirectory());
- // /* --------------------------------
- // * jetzt die Images durchlaufen
- // * --------------------------------*/
- // File[] dateien = tifOrdner.listFiles(filterTifDateien);
- // if (dateien.length != 0) {
- // for (int i = 0; i < 1; i++) {
- // counter++;
- // TiffConverter tiffConv = new TiffConverter(proz.getImagesTifDirectory() +
- // dateien[i].getName());
- // tiffConv.getTiffField(305));
- // String tiffField = tiffConv.getTiffField(305).toLowerCase();
- // if (!tiffField.contains("pixedit") && !tiffField.contains("photoshop"))
- // Helper.setFehlerMeldung("nicht nachbearbeitet: " + proz.getTitel() + " - ",
- // proz.getImagesTifDirectory()
- // + dateien[i].getName());
- // }
- // }
- // }
- // Helper.setMeldung(null, "", counter + " Images durchlaufen");
- // }
- /*
- * #####################################################
* ##################################################### ## ## Getter und
* Setter ## #####################################################
* ####################################################
=== modified file 'src/de/sub/goobi/forms/AktuelleSchritteForm.java'
--- src/de/sub/goobi/forms/AktuelleSchritteForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/AktuelleSchritteForm.java 2012-02-22 14:09:22 +0000
@@ -146,18 +146,10 @@
myFilteredDataSource.setFilter(filter);
}
- // // HibernateUtil.clearSession();
- // myFilteredDataSource = new UserDefinedStepFilter();
- // myFilteredDataSource.getObservable().addObserver(Helper.createObserver());
- //
- // ((UserDefinedStepFilter) myFilteredDataSource).setFilterModes(nurOffeneSchritte, nurEigeneSchritte);
- // myFilteredDataSource.setFilter(filter);
-
Criteria crit = myFilteredDataSource.getCriteria();
sortList(crit);
page = new Page(crit, 0);
- // calcHomeImages();
} catch (HibernateException he) {
Helper.setFehlerMeldung("error on reading database", he.getMessage());
return "";
@@ -246,7 +238,6 @@
if (mySchritt.isTypImagesLesen() || mySchritt.isTypImagesSchreiben())
DownloadToHome();
}
- // calcHomeImages();
} else {
Helper.setFehlerMeldung("stepInWorkError");
return "";
@@ -288,7 +279,6 @@
new ProzessDAO().save(mySchritt.getProzess());
} catch (DAOException e) {
}
- // calcHomeImages();
return "AktuelleSchritteAlle";
}
@@ -404,9 +394,9 @@
SchrittDAO dao = new SchrittDAO();
Schritt temp = dao.get(myProblemID);
temp.setBearbeitungsstatusEnum(StepStatus.OPEN);
- // if (temp.getPrioritaet().intValue() == 0)
temp.setCorrectionStep();
temp.setBearbeitungsende(null);
+
Schritteigenschaft se = new Schritteigenschaft();
se.setTitel("Korrektur notwendig");
se.setWert(problemMessage);
@@ -425,9 +415,9 @@
for (Iterator<Schritt> iter = alleSchritteDazwischen.iterator(); iter.hasNext();) {
Schritt step = (Schritt) iter.next();
step.setBearbeitungsstatusEnum(StepStatus.LOCKED);
- // if (step.getPrioritaet().intValue() == 0)
step.setCorrectionStep();
step.setBearbeitungsende(null);
+
Schritteigenschaft seg = new Schritteigenschaft();
seg.setTitel("Korrektur notwendig");
seg.setWert(Messages.getString("KorrekturFuer") + temp.getTitel() + ": " + problemMessage);
@@ -487,7 +477,6 @@
step.setBearbeitungsstatusEnum(StepStatus.OPEN);
step.setCorrectionStep();
step.setBearbeitungsende(null);
- // step.setBearbeitungsbeginn(null);
step.setBearbeitungszeitpunkt(now);
}
Schritteigenschaft seg = new Schritteigenschaft();
@@ -587,7 +576,6 @@
myDav.DownloadToHome(proz, step.getId().intValue(), false);
}
}
- // calcHomeImages();
Helper.setMeldung(null, "Created directies in user home", "");
return "";
}
@@ -611,7 +599,6 @@
myDav.DownloadToHome(proz, step.getId().intValue(), false);
}
}
- // calcHomeImages();
Helper.setMeldung(null, "Created directories in user home", "");
return "";
}
@@ -670,7 +657,6 @@
}
public int getHomeBaende() {
- // return myDav.getAnzahlBaende("");
return 0;
}
@@ -693,7 +679,6 @@
Schritt step = (Schritt) iter.next();
try {
if (step.getBearbeitungsstatusEnum() == StepStatus.OPEN) {
- // gesamtAnzahlImages += myDav.getAnzahlImages(step.getProzess().getImagesOrigDirectory());
// TODO: Remove hard coded extension
gesamtAnzahlImages += FileUtils.getNumberOfFiles(step.getProzess().getImagesOrigDirectory());
}
@@ -701,19 +686,6 @@
myLogger.error(e);
}
}
-
- // for (Iterator iter = page.getList().iterator(); iter.hasNext();) {
- // Schritt step = (Schritt) iter.next();
- // try {
- // if (step.getBearbeitungsstatus().intValue() == 1)
- // pageAnzahlImages += myDav.getAnzahlImages(step.getProzess().getOrigPfad());
- // } catch (IOException e) {
- // myLogger.error(e);
- // } catch (InterruptedException e) {
- // myLogger.error(e);
-
- // }
- // }
}
}
@@ -857,11 +829,6 @@
tiff.ExportStart();
}
- /*
- * public void DownloadRusExport() throws IOException, ReadException, InterruptedException, PreferencesException, SwapException, DAOException,
- * WriteException { RusslandExport rus = new RusslandExport(mySchritt.getProzess()); rus.ExportStart(); }
- */
-
public void ExportDMS() {
ExportDms export = new ExportDms();
try {
@@ -911,10 +878,5 @@
*/
public void setWikiField(String inString) {
mySchritt.getProzess().setWikifield(inString);
- // try {
- // new ProzessDAO().save(mySchritt.getProzess());
- // } catch (DAOException e) {
- // myLogger.error(e);
- // }
}
}
=== modified file 'src/de/sub/goobi/forms/BenutzergruppenForm.java'
--- src/de/sub/goobi/forms/BenutzergruppenForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/BenutzergruppenForm.java 2012-02-22 14:09:22 +0000
@@ -65,10 +65,8 @@
public String FilterKein() {
try {
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
- // session.flush();
- session.clear();
+ session.clear();
Criteria crit = session.createCriteria(Benutzergruppe.class);
crit.addOrder(Order.asc("titel"));
page = new Page(crit, 0);
=== modified file 'src/de/sub/goobi/forms/BenutzerverwaltungForm.java'
--- src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2012-02-22 14:09:22 +0000
@@ -79,10 +79,8 @@
public String FilterKein() {
filter = null;
try {
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
- // session.flush();
- session.clear();
+ session.clear();
Criteria crit = session.createCriteria(Benutzer.class);
crit.add(Restrictions.isNull("isVisible"));
if (hideInactiveUsers)
@@ -107,10 +105,8 @@
*/
public String FilterAlleStart() {
try {
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
- // session.flush();
- session.clear();
+ session.clear();
Criteria crit = session.createCriteria(Benutzer.class);
crit.add(Restrictions.isNull("isVisible"));
if (hideInactiveUsers)
@@ -125,7 +121,6 @@
crit.addOrder(Order.asc("nachname"));
crit.addOrder(Order.asc("vorname"));
page = new Page(crit, 0);
- //calcHomeImages();
} catch (HibernateException he) {
Helper.setFehlerMeldung("Error, could not read", he.getMessage());
return "";
@@ -327,4 +322,4 @@
this.hideInactiveUsers = hideInactiveUsers;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/forms/HelperForm.java'
--- src/de/sub/goobi/forms/HelperForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/HelperForm.java 2012-02-22 14:09:22 +0000
@@ -74,27 +74,9 @@
}
public String getApplicationLogo() {
-// GetMethod method = null;
-// try {
-// HttpClient httpclient = new HttpClient();
-// method = new GetMethod("http://is.gd/feWO5";);
-// int statusCode = httpclient.executeMethod(method);
-// if (statusCode == HttpStatus.SC_OK) {
-// return method.getURI().getURI();
-// }
-// } catch (URIException e) {
-// // do nothing, no internet connection found, using local image
-// } catch (HttpException e) {
-// // do nothing, no internet connection found, using local image
-// } catch (IOException e) {
-// // do nothing, no internet connection found, using local image
-// } finally {
-// method.releaseConnection();
-// }
String logo = getServletPathWithHostAsUrl() + IMAGE_PATH + "/template/";
logo += ConfigMain.getParameter("ApplicationLogo", "goobi_meta_klein.jpg");
-
return logo;
}
@@ -203,7 +185,7 @@
int serverPort = request.getServerPort(); // 80
String contextPath = request.getContextPath(); // /mywebapp
String reqUrl = scheme + "://" + serverName + ":" + serverPort + contextPath;
- // String reqUrl = request.getRequestURL().toString();
+
return reqUrl;
}
@@ -276,23 +258,6 @@
}
public String getLogoUrl() {
-// GetMethod method = null;
-// try {
-// HttpClient httpclient = new HttpClient();
-// method = new GetMethod("http://is.gd/feWHt";);
-// int statusCode = httpclient.executeMethod(method);
-// if (statusCode == HttpStatus.SC_OK) {
-// return method.getURI().getURI();
-// }
-// } catch (URIException e) {
-// // do nothing, no internet connection found, using local image
-// } catch (HttpException e) {
-// // do nothing, no internet connection found, using local image
-// } catch (IOException e) {
-// // do nothing, no internet connection found, using local image
-// } finally {
-// method.releaseConnection();
-// }
return getServletPathWithHostAsUrl() + "/newpages/images/template/goobiVersionLogoBig.jpg";
}
}
=== modified file 'src/de/sub/goobi/forms/LdapGruppenForm.java'
--- src/de/sub/goobi/forms/LdapGruppenForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/LdapGruppenForm.java 2012-02-22 14:09:22 +0000
@@ -65,10 +65,8 @@
public String FilterKein() {
try {
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
- // session.flush();
- session.clear();
+ session.clear();
Criteria crit = session.createCriteria(LdapGruppe.class);
crit.addOrder(Order.asc("titel"));
page = new Page(crit, 0);
=== modified file 'src/de/sub/goobi/forms/LoginForm.java'
--- src/de/sub/goobi/forms/LoginForm.java 2012-02-22 14:05:06 +0000
+++ src/de/sub/goobi/forms/LoginForm.java 2012-02-22 14:09:22 +0000
@@ -73,6 +73,15 @@
Helper.setFehlerMeldung("login", "", Helper.getTranslation("wrongLogin"));
} else {
+<<<<<<< TREE
+=======
+ }
+ } else {
+ Helper.setFehlerMeldung("login", "", Helper.getTranslation("wrongLogin"));
+ }
+ return "";
+ }
+>>>>>>> MERGE-SOURCE
/* prüfen, ob schon ein Benutzer mit dem Login existiert */
// TODO: Use generics.
List<Benutzer> treffer;
@@ -183,7 +192,6 @@
if (!passwortAendernNeu1.equals(passwortAendernNeu2)) {
Helper.setFehlerMeldung("passwortform:passwortAendernNeu1", "", Helper.getTranslation("neuesPasswortNichtGleich"));
} else {
- // myBenutzer.setPasswortCrypt(passwortAendernNeu1);
try {
/* wenn alles korrekt, dann jetzt speichern */
Ldap myLdap = new Ldap();
=== modified file 'src/de/sub/goobi/forms/LongRunningTasksForm.java'
--- src/de/sub/goobi/forms/LongRunningTasksForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/LongRunningTasksForm.java 2012-02-22 14:09:22 +0000
@@ -39,14 +39,6 @@
return LongRunningTaskManager.getInstance().getTasks();
}
- /*
- * public void addNewSwapOutTask() throws DAOException { Prozess p = new ProzessDAO().get(118); task = new ProcessSwapOutTask();
- * task.initialize(p); LongRunningTaskManager.getInstance().addTask(task); }
- *
- * public void addNewSwapInTask() throws DAOException { Prozess p = new ProzessDAO().get(118); task = new ProcessSwapInTask(); task.initialize(p);
- * LongRunningTaskManager.getInstance().addTask(task); }
- */
-
public void addNewMasterTask() {
Prozess p = new Prozess();
p.setTitel("hallo Titel " + System.currentTimeMillis());
@@ -123,4 +115,4 @@
public void toggleRunning() {
LongRunningTaskManager.getInstance().setRunning(!LongRunningTaskManager.getInstance().isRunning());
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/forms/ModuleServerForm.java'
--- src/de/sub/goobi/forms/ModuleServerForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/ModuleServerForm.java 2012-02-22 14:09:22 +0000
@@ -88,7 +88,6 @@
} catch (XmlRpcException e) {
Helper.setFehlerMeldung("XmlRpcException im Modul " + md.getName() + " mit der URL " + md.getUrl() + ": ", e.getMessage() + "\n"
+ Helper.getStacktraceAsString(e));
- // logger.error(e);
}
}
running = true;
@@ -163,22 +162,9 @@
Helper.setFehlerMeldung("GoobiModuleException: ", e.getMessage() + "\n" + Helper.getStacktraceAsString(e));
logger.error(e);
} catch (XmlRpcException e) {
- // Helper.setFehlerMeldung("XmlRpcException: " + e.code + " ", e.getMessage());
- // logger.error(e);
}
}
- // /**
- // * den Modulemanager durchlaufen und ein Module mit dem übergebenem Namen zurückgeben
- // * ================================================================
- // */
- // public ModuleDesc getModuleByName(String inName) {
- // for (ModuleDesc md : modulmanager)
- // if (md.getName().equals(inName))
- // return md;
- // return null;
- // }
-
/**
* Module-Konfigurationen aus externer xml-Datei modules.xml einlesen ================================================================
*/
@@ -268,7 +254,6 @@
GoobiModuleParameter gmp1 = new GoobiModuleParameter(processId, tempID, myModule.getModuleClient().longsessionID, typeParameters);
HttpSession insession = (HttpSession) FacesContext.getCurrentInstance().getExternalContext().getSession(false);
- // String applicationUrl = ConfigMain.getParameter("ApplicationWebsiteUrl");
String applicationUrl = new HelperForm().getServletPathWithHostAsUrl();
gmp1.put("return_url", applicationUrl + HelperForm.MAIN_JSF_PATH + "/AktuelleSchritteBearbeiten.jsf?jsessionId=" + insession.getId());
myModule.getGmps().add(gmp1); // add session in den Manager
@@ -289,10 +274,9 @@
String tempID = UniqueID.generate_session();
myRunningShortSessions.put(tempID, processId);
GoobiModuleParameter gmp = new GoobiModuleParameter(processId, tempID, myModule.getModuleClient().longsessionID, null);
- // gmp.put("return_url", "http://localhost:8081/Goobi/newpages/aktiveModule.jsf?sessionId=";
- // + tempID);
+
String applicationUrl = ConfigMain.getParameter("ApplicationWebsiteUrl");
- // String applicationUrl = new HelperForm().getServletPathWithHostAsUrl();
+
gmp.put("return_url", applicationUrl + HelperForm.MAIN_JSF_PATH + "/aktiveModule.jsf?sessionId=" + tempID);
gmp.put("type", "PRODUCE");
@@ -300,12 +284,6 @@
Helper.setMeldung(myModule.getModuleClient().start(gmp));
Helper.setMeldung(gmp.toString());
- /* und Shortsession wieder stoppen */
- // modules.get(0).getModuleClient().stop(gmp1);
- // shutdown
- // try{
- // modules.get(0).moduleClient.shutdown();
- // }catch (XmlRpcException e){ }
}
/*
=== modified file 'src/de/sub/goobi/forms/NavigationForm.java'
--- src/de/sub/goobi/forms/NavigationForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/NavigationForm.java 2012-02-22 14:09:22 +0000
@@ -41,14 +41,6 @@
}
public String JeniaPopupCloseAction(){
-// Helper help = new Helper();
-// BenutzerverwaltungForm bvf = (BenutzerverwaltungForm) Helper.getManagedBeanValue("#{BenutzerverwaltungForm}");
-// bvf.getMyClass().setStandort("die ID lautet: " + help.getRequestParameter("ID"));
-// try {
-// bvf.setMyClass(new BenutzerDAO().get(bvf.getMyClass().getId()));
-// } catch (DAOException e) {
-// e.printStackTrace();
-// }
return "jeniaClosePopupFrameWithAction";
}
@@ -72,6 +64,4 @@
return ConfigMain.getBooleanParameter("show_taskmanager");
}
-
-
}
=== modified file 'src/de/sub/goobi/forms/ProjekteForm.java'
--- src/de/sub/goobi/forms/ProjekteForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/ProjekteForm.java 2012-02-22 14:09:22 +0000
@@ -199,9 +199,7 @@
public String FilterKein() {
try {
Session session = Helper.getHibernateSession();
- // session.flush();
session.clear();
- // session = Helper.getHibernateSession();
Criteria crit = session.createCriteria(Projekt.class);
crit.addOrder(Order.asc("titel"));
page = new Page(crit, 0);
@@ -242,8 +240,7 @@
// to be deleted fileGroups ids are listed
// and deleted after a commit
deletedFileGroups.add(myFilegroup.getId());
- // original line
- // myProjekt.getFilegroups().remove(myFilegroup);
+
return "ProjekteBearbeiten";
}
@@ -544,7 +541,7 @@
this.projectProgressImage = "";
}
} catch (Exception e) {
- // this.projectProgressData = null;
+
}
}
return this.projectProgressData;
@@ -601,7 +598,6 @@
*********************************************************/
public String getProjectStatImages() throws IOException, InterruptedException {
- // return getProjectStatVolumes();
if (projectStatImages == null) {
projectStatImages = System.currentTimeMillis() + "images.png";
calcProjectStats(projectStatImages, true);
=== modified file 'src/de/sub/goobi/forms/ProzesskopieForm.java'
--- src/de/sub/goobi/forms/ProzesskopieForm.java 2012-01-19 15:10:09 +0000
+++ src/de/sub/goobi/forms/ProzesskopieForm.java 2012-02-22 14:09:22 +0000
@@ -240,7 +240,7 @@
public List<SelectItem> getProzessTemplates() throws DAOException {
List<SelectItem> myProzessTemplates = new ArrayList<SelectItem>();
- // HibernateUtil.clearSession();
+
Session session = Helper.getHibernateSession();
Criteria crit = session.createCriteria(Prozess.class);
crit.add(Restrictions.eq("istTemplate", Boolean.valueOf(false)));
@@ -297,7 +297,6 @@
Helper.setMeldung(null, "Found more then one hit", " - use first hit");
} catch (Exception e) {
Helper.setFehlerMeldung("Error on reading opac ", e);
- // myLogger.error(e);
}
return "";
}
@@ -311,7 +310,6 @@
*/
private void fillFieldsFromMetadataFile() throws PreferencesException {
if (myRdf != null) {
- // UghHelper ughHelp = new UghHelper();
for (AdditionalField field : additionalFields) {
if (field.isUghbinding() && field.getShowDependingOnDoctype()) {
@@ -451,7 +449,6 @@
Helper.setFehlerMeldung(Helper.getTranslation("UnvollstaendigeDaten") + " Process title is empty");
}
- // if (!prozessKopie.getTitel().matches("[\\w-]*")) {
String validateRegEx = ConfigMain.getParameter("validateProzessTitelRegex", "[\\w-]*");
if (!prozessKopie.getTitel().matches(validateRegEx)) {
valide = false;
@@ -954,7 +951,6 @@
List<Element> projektnamen = projekt.getChildren("name");
for (Iterator<Element> iterator = projektnamen.iterator(); iterator.hasNext();) {
Element projektname = (Element) iterator.next();
- // " - soll sein: " + prozessKopie.getProjekt().getTitel());
/*
* wenn der Projektname aufgeführt wird, dann alle Digitalen Collectionen in die Liste
@@ -1214,16 +1210,7 @@
Helper.setFehlerMeldung("IOException", e.getMessage());
return;
}
- // if (docType.equals("monograph"))
- // tif_definition = cp.getParamString("tifheader.monograph");
- // if (docType.equals("containedwork"))
- // tif_definition = cp.getParamString("tifheader.containedwork");
- // if (docType.equals("multivolume"))
- // tif_definition = cp.getParamString("tifheader.multivolume");
- // if (docType.equals("periodical"))
- // tif_definition = cp.getParamString("tifheader.periodical");
- // if (docType.equals("volume"))
- // tif_definition = cp.getParamString("tifheader.volume");
+
tif_definition = cp.getParamString("tifheader." + docType, "intranda");
/*
@@ -1235,35 +1222,23 @@
/*
* -------------------------------- Documentname ist im allgemeinen = Prozesstitel --------------------------------
*/
- // if (tifHeader_documentname.equals(""))
tifHeader_documentname = prozessKopie.getTitel();
tifHeader_imagedescription = "";
/*
* -------------------------------- Imagedescription --------------------------------
*/
- // if (tifHeader_imagedescription.equals("")) {
+
StringTokenizer tokenizer = new StringTokenizer(tif_definition, "+");
/* jetzt den Tiffheader parsen */
String title = "";
while (tokenizer.hasMoreTokens()) {
String myString = tokenizer.nextToken();
/*
- * wenn der String mit ' anf�ngt und mit ' endet, dann den Inhalt so übernehmen
+ * wenn der String mit ' anfängt und mit ' endet, dann den Inhalt so übernehmen
*/
if (myString.startsWith("'") && myString.endsWith("'") && myString.length() > 2)
tifHeader_imagedescription += myString.substring(1, myString.length() - 1);
else if (myString.equals("$Doctype")) {
- /* wenn der Doctype angegeben werden soll */
- // if (docType.equals("monograph"))
- // tifHeader_imagedescription += "Monographie";
- // if (docType.equals("volume"))
- // tifHeader_imagedescription += "Volume";
- // if (docType.equals("containedwork"))
- // tifHeader_imagedescription += "ContainedWork";
- // if (docType.equals("multivolume"))
- // tifHeader_imagedescription += "Band_MultivolumeWork";
- // if (docType.equals("periodical"))
- // tifHeader_imagedescription += "Band_Zeitschrift";
tifHeader_imagedescription += co.getDoctypeByName(docType).getTifHeaderType();
} else {
/* andernfalls den string als Feldnamen auswerten */
@@ -1302,31 +1277,6 @@
public String downloadDocket() {
return prozessKopie.downloadDocket();
-// myLogger.debug("generate run note for process " + prozessKopie.getId());
-// String rootpath = ConfigMain.getParameter("xsltFolder");
-// File xsltfile = new File(rootpath, "docket.xsl");
-// FacesContext facesContext = FacesContext.getCurrentInstance();
-// if (!facesContext.getResponseComplete()) {
-// HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse();
-// String fileName = "docket.pdf";
-// ServletContext servletContext = (ServletContext) facesContext.getExternalContext().getContext();
-// String contentType = servletContext.getMimeType(fileName);
-// response.setContentType(contentType);
-// response.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\"");
-//
-// // write run note to servlet output stream
-// try {
-// ServletOutputStream out = response.getOutputStream();
-// ExportDocket ern = new ExportDocket();
-// ern.startExport(prozessKopie, out, xsltfile.getAbsolutePath());
-// out.flush();
-// } catch (IOException e) {
-// myLogger.error("IOException while exporting run note", e);
-// }
-//
-// facesContext.responseComplete();
-// }
-// return "";
}
/**
=== modified file 'src/de/sub/goobi/forms/ProzessverwaltungForm.java'
--- src/de/sub/goobi/forms/ProzessverwaltungForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/ProzessverwaltungForm.java 2012-02-22 14:09:22 +0000
@@ -306,7 +306,6 @@
myFilteredDataSource = new LuceneFilter(filter.substring("lucene".length()));
} else {
myFilteredDataSource = new UserDefinedFilter(filter);
- // myFilteredDataSource = new UserProjectFilter(14);
}
// set observable to replace helper.setMessage
@@ -314,13 +313,6 @@
// // calling the criteria as the result of the filter
Criteria crit = myFilteredDataSource.getCriteria();
- // myFilteredDataSource = new UserDefinedFilter(getFilter());
- // // set observable to replace helper.setMessage
- // myFilteredDataSource.getObservable().addObserver(
- // new Helper().createObserver());
- //
- // // calling the criteria as the result of the filter
- // Criteria crit = myFilteredDataSource.getCriteria();
// first manipulation of the created criteria
@@ -334,10 +326,6 @@
/* noch sortieren */
sortList(crit);
- /* Debugging */
- // for (Iterator it = crit.list().iterator(); it.hasNext();) {
- // Prozess p = (Prozess) it.next();
- // }
page = new Page(crit, 0);
} catch (HibernateException he) {
Helper.setFehlerMeldung("fehlerBeimEinlesen", he.getMessage());
@@ -591,9 +579,6 @@
export.startExport(myProzess);
} catch (Exception e) {
Helper.setFehlerMeldung("An error occured while trying to export METS file for: " + myProzess.getTitel(), e);
- // Helper.setFehlerMeldung(
- // "An error occured while trying to export METS file for: "
- // + myProzess.getTitel(), e);
logger.error("ExportMETS error", e);
}
}
@@ -802,7 +787,6 @@
}
private void stepStatusDown(Prozess proz) throws DAOException {
- // debug("proz.getSchritteList: ", proz.getSchritteList());
List<Schritt> tempList = new ArrayList<Schritt>(proz.getSchritteList());
debug("templist: ", tempList);
@@ -811,9 +795,7 @@
debug("reverse: ", tempList);
for (Schritt step : tempList) {
- // logger.warn(step.getTitel());
if (proz.getSchritteList().get(0) != step && step.getBearbeitungsstatusEnum() != StepStatus.LOCKED) {
- // logger.error("passt: " + step.getTitel() + " " + step.getReihenfolge());
step.setEditTypeEnum(StepEditType.ADMIN);
HelperSchritte.updateEditing(step);
step.setBearbeitungsstatusDown();
@@ -921,7 +903,6 @@
}
public void setMySchrittReload(Schritt mySchritt) {
- // Helper.getHibernateSession();
this.mySchritt = mySchritt;
}
@@ -930,7 +911,6 @@
}
public void setMySchrittEigenschaft(Schritteigenschaft mySchrittEigenschaft) {
- // Helper.getHibernateSession();
this.mySchrittEigenschaft = mySchrittEigenschaft;
}
@@ -943,7 +923,6 @@
}
public void setMyVorlageReload(Vorlage myVorlage) {
- // Helper.getHibernateSession();
this.myVorlage = myVorlage;
}
@@ -952,7 +931,6 @@
}
public void setMyVorlageEigenschaft(Vorlageeigenschaft myVorlageEigenschaft) {
- // Helper.getHibernateSession();
this.myVorlageEigenschaft = myVorlageEigenschaft;
}
@@ -965,7 +943,6 @@
}
public void setMyWerkstueckReload(Werkstueck myWerkstueck) {
- // Helper.getHibernateSession();
this.myWerkstueck = myWerkstueck;
}
@@ -974,7 +951,6 @@
}
public void setMyWerkstueckEigenschaft(Werkstueckeigenschaft myWerkstueckEigenschaft) {
- // Helper.getHibernateSession();
this.myWerkstueckEigenschaft = myWerkstueckEigenschaft;
}
@@ -1265,9 +1241,6 @@
* @author Wulf
*/
public String getResetStatistic() {
- // if (!showStatistics) {
- // statisticsManager = null;
- // }
showStatistics = false;
return "";
}
=== modified file 'src/de/sub/goobi/forms/RegelsaetzeForm.java'
--- src/de/sub/goobi/forms/RegelsaetzeForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/RegelsaetzeForm.java 2012-02-22 14:09:22 +0000
@@ -68,10 +68,8 @@
public String FilterKein() {
try {
- // HibernateUtil.clearSession();
Session session = Helper.getHibernateSession();
- // session.flush();
- session.clear();
+ session.clear();
Criteria crit = session.createCriteria(Regelsatz.class);
crit.addOrder(Order.asc("titel"));
page = new Page(crit, 0);
=== modified file 'src/de/sub/goobi/forms/SessionForm.java'
--- src/de/sub/goobi/forms/SessionForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/SessionForm.java 2012-02-22 14:09:22 +0000
@@ -42,7 +42,7 @@
* @version 1.00 - 16.01.2005
*/
public class SessionForm {
- // private static final Logger logger = Logger.getLogger(SessionForm.class);
+
private int sessionZeit = 3600 * 2; // 2 Stunden
@SuppressWarnings("unchecked")
private List alleSessions = new ArrayList();
@@ -80,7 +80,7 @@
@SuppressWarnings("unchecked")
private void sessionAdd(HttpSession insession) {
- // logger.debug("sessionAdd-start");
+
insession.setMaxInactiveInterval(sessionZeit);
//TODO: Remove this, it's ugly and evil.
@@ -117,7 +117,7 @@
map.put("browserIcon", "netscape.gif");
}
alleSessions.add(map);
- // logger.debug("sessionAdd-ende");
+
}
@@ -128,7 +128,7 @@
for (Iterator iter = temp.iterator(); iter.hasNext();) {
HashMap map = (HashMap) iter.next();
long differenz = System.currentTimeMillis() - ((Long) map.get("last2")).longValue();
- // logger.debug(element.get("last2") + ": " + String.valueOf(differenz / 1000));
+
if (differenz / 1000 > sessionZeit || map.get("address") == null || (map.get("user").equals("- ausgeloggt - ")) ){
alleSessions.remove(map);
}
@@ -139,7 +139,7 @@
@SuppressWarnings("unchecked")
public void sessionAktualisieren(HttpSession insession) {
- // logger.debug("sessionAktualisieren-start");
+
boolean gefunden = false;
aktuelleZeit = formatter.format(new Date());
for (Iterator iter = alleSessions.iterator(); iter.hasNext();) {
@@ -154,14 +154,14 @@
if (!gefunden)
sessionAdd(insession);
sessionsAufraeumen();
- // logger.debug("sessionAktualisieren-ende");
+
}
@SuppressWarnings("unchecked")
public void sessionBenutzerAktualisieren(HttpSession insession, Benutzer inBenutzer) {
- // logger.debug("sessionBenutzerAktualisieren-start");
+
for (Iterator iter = alleSessions.iterator(); iter.hasNext();) {
HashMap map = (HashMap) iter.next();
if (map.get("id").equals(insession.getId())) {
@@ -177,7 +177,7 @@
break;
}
}
- // logger.debug("sessionBenutzerAktualisieren-ende");
+
}
@@ -234,4 +234,4 @@
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/forms/SpracheForm.java'
--- src/de/sub/goobi/forms/SpracheForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/SpracheForm.java 2012-02-22 14:09:22 +0000
@@ -42,7 +42,7 @@
locale = (Locale) FacesContext.getCurrentInstance().getApplication().getSupportedLocales().next();
break;
}
-// locale = Locale.GERMANY;
+
FacesContext.getCurrentInstance().getViewRoot().setLocale(locale);
Helper.loadLanguageBundle();
}
@@ -55,7 +55,7 @@
* @return Navigationsanweisung "null" als String - daher ein Reload der gleichen Seite mit neuer Sprache
*/
public String SpracheUmschalten() {
-// Helper help = new Helper();
+
String aktuelleSprache = Helper.getRequestParameter("locale");
if ("en".equals(aktuelleSprache))
@@ -81,4 +81,4 @@
public Locale getLocale() {
return locale;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/forms/StatistikForm.java'
--- src/de/sub/goobi/forms/StatistikForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/StatistikForm.java 2012-02-22 14:09:22 +0000
@@ -182,7 +182,7 @@
return 0;
try {
- // HibernateUtil.clearSession();
+
Session session = Helper.getHibernateSession();
Criteria crit = session.createCriteria(Schritt.class);
=== modified file 'src/de/sub/goobi/helper/BeanHelper.java'
--- src/de/sub/goobi/helper/BeanHelper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/BeanHelper.java 2012-02-22 14:09:22 +0000
@@ -106,7 +106,7 @@
* --------------------------------*/
Schritt stepneu = new Schritt();
stepneu.setTypAutomatisch(step.isTypAutomatisch());
-// stepneu.setAllScripts(step.getAllScripts());
+
stepneu.setScriptname1(step.getScriptname1());
stepneu.setScriptname2(step.getScriptname2());
stepneu.setScriptname3(step.getScriptname3());
@@ -134,7 +134,7 @@
stepneu.setBearbeitungsstatusEnum(step.getBearbeitungsstatusEnum());
stepneu.setReihenfolge(step.getReihenfolge());
stepneu.setTitel(step.getTitel());
- // stepneu.setTyp(step.getTyp());
+
stepneu.setHomeverzeichnisNutzen(step.getHomeverzeichnisNutzen());
stepneu.setProzess(prozessKopie);
=== modified file 'src/de/sub/goobi/helper/FileUtils.java'
--- src/de/sub/goobi/helper/FileUtils.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/FileUtils.java 2012-02-22 14:09:22 +0000
@@ -50,11 +50,6 @@
/* --------------------------------
* die Images zählen
* --------------------------------*/
-// FilenameFilter filter = new FilenameFilter() {
-// public boolean accept(File dir, String name) {
-// return name.toLowerCase().endsWith(ext.toLowerCase());
-// }
-// };
anzahl = inDir.list(MetadatenImagesHelper.filter).length;
/* --------------------------------
=== modified file 'src/de/sub/goobi/helper/GoobiScript.java'
--- src/de/sub/goobi/helper/GoobiScript.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/GoobiScript.java 2012-02-22 14:09:22 +0000
@@ -158,25 +158,6 @@
return;
}
- // /* --------------------------------
- // * Aufruf der richtigen Action-Methode über Reflektion
- // * --------------------------------*/
- // try {
- // String trallala = (String) myParameters.get("action");
- // Method method = this.getClass().getMethod(trallala, new Class[] { List.class });
- // method.invoke(this, new Object[] { inProzesse });
- // } catch (SecurityException e) {
- // e.printStackTrace();
- // } catch (NoSuchMethodException e) {
- // e.printStackTrace();
- // } catch (IllegalArgumentException e) {
- // e.printStackTrace();
- // } catch (IllegalAccessException e) {
- // e.printStackTrace();
- // } catch (InvocationTargetException e) {
- // e.printStackTrace();
- // }
-
Helper.setMeldung("goobiScriptfield", "", "GoobiScript beendet");
}
@@ -190,13 +171,6 @@
task.initialize(p);
LongRunningTaskManager.getInstance().addTask(task);
- // try {
- // ProcessSwapper ps = ProcessSwapper.getInstance();
- // ps.swapOut(p);
- // } catch (Exception e) {
- // Helper.setFehlerMeldung("Fehler bei Auslagerung", e);
- // break;
- // }
}
}
@@ -210,13 +184,6 @@
task.initialize(p);
LongRunningTaskManager.getInstance().addTask(task);
- // try {
- // ProcessSwapper ps = ProcessSwapper.getInstance();
- // ps.swapIn(p);
- // } catch (Exception e) {
- // Helper.setFehlerMeldung("Fehler bei Einlagerung", e);
- // break;
- // }
}
}
=== modified file 'src/de/sub/goobi/helper/Helper.java'
--- src/de/sub/goobi/helper/Helper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/Helper.java 2012-02-22 14:09:22 +0000
@@ -184,7 +184,7 @@
}
return;
}
-// ResourceBundle bundle = ResourceBundle.getBundle("messages.messages", context.getViewRoot().getLocale());
+
String msg = "";
String beschr = "";
try {
@@ -213,11 +213,6 @@
}
}
- // public static Object getManagedBean(String name) {
- // FacesContext context = FacesContext.getCurrentInstance();
- // Object obj = context.getApplication().getVariableResolver().resolveVariable(context, name);
- // return obj;
- // }
public static Object getManagedBeanValue(String expr) {
FacesContext context = FacesContext.getCurrentInstance();
if (context == null) {
@@ -228,17 +223,6 @@
}
public static Session getHibernateSession() {
- // TODO: Fix for Hibernate-Session-Management, replaced with older version here
- // Session s;
- // try {
- // s = HibernateUtil.getSessionFactory().getCurrentSession();
- // } catch (HibernateException e) {
- // myLogger.info("cannot get session from context, generate a new session");
- // // s = HibernateUtil.getSessionFactory().openSession();
- // s=HibernateUtilOld.getSession();
- // }
- // return s;
-
// Fix for Hibernate-Session-Management, old version - START
Session sess;
try {
@@ -301,25 +285,6 @@
}
}
- /**
- * NOCH FEHLERHAFT enhanced call of script with error messages and return value of script, call it with special encoding
- * ================================================================
- */
- // TODO: Remove this method
- /*
- * public int callShell3(String command) throws IOException, InterruptedException { myLogger.debug("execute Shellcommand callShell3: " + command);
- * if (command == null || command.length() == 0) return 1;
- *
- * StringTokenizer strtok = new StringTokenizer(command, " "); Process process = Runtime.getRuntime().exec(strtok.nextToken());
- *
- * // set encoding BufferedWriter outCommand = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), "UTF-8"));
- * outCommand.write(strtok.hasMoreTokens() ? strtok.nextToken() : ""); outCommand.flush();
- *
- * Scanner scanner = new Scanner(process.getInputStream()); while (scanner.hasNextLine()) { String myLine = scanner.nextLine();
- * setMeldung(myLine); } scanner.close(); scanner = new Scanner(process.getErrorStream()); while (scanner.hasNextLine()) {
- * setFehlerMeldung(scanner.nextLine()); } scanner.close(); int rueckgabe = process.waitFor(); return rueckgabe; }
- */
-
// TODO: Move the Stuff below in a class for interaction with a local file system
public void createUserDirectory(String inDirPath, String inUser) throws IOException, InterruptedException {
@@ -371,7 +336,6 @@
public static String getTranslation(String dbTitel) {
// running instance of ResourceBundle doesn't respond on user language changes, workaround by instanciating it every time
- // SprachbundleLaden();
try {
if (localBundle != null) {
@@ -514,8 +478,7 @@
public boolean accept(File dir, String name) {
boolean fileOk = false;
String prefix = ConfigMain.getParameter("ImagePrefix", "\\d{8}");
- // String suffix = ConfigMin.getParameter("ImageSuffix", "\\.[Tt][Ii][Ff][Ff]?");
- // return name.matches(prefix + suffix);
+
if (name.matches(prefix + "\\.[Tt][Ii][Ff][Ff]?")) {
fileOk = true;
} else if (name.matches(prefix + "\\.[jJ][pP][eE]?[gG]")) {
=== modified file 'src/de/sub/goobi/helper/HelperSchritte.java'
--- src/de/sub/goobi/helper/HelperSchritte.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/HelperSchritte.java 2012-02-22 14:09:22 +0000
@@ -52,7 +52,7 @@
//TODO: Check if some methods can declared static
public class HelperSchritte {
SchrittDAO dao = new SchrittDAO();
- // Helper help = new Helper();
+
private static final Logger logger = Logger.getLogger(HelperSchritte.class);
public final static String DIRECTORY_PREFIX = "orig_";
@@ -77,16 +77,6 @@
.add(Restrictions.ne("bearbeitungsstatus", 3)).add(Restrictions.ne("id", inSchritt.getId())).createCriteria("prozess").add(
Restrictions.idEq(inSchritt.getProzess().getId())).list().size();
- // if (offeneSchritteGleicherReihenfolge != 0) {
- // List bla = Helper.getHibernateSession().createCriteria(Schritt.class).add(
- // Restrictions.eq("reihenfolge", inSchritt.getReihenfolge())).add(
- // Restrictions.ne("bearbeitungsstatus", 3)).add(Restrictions.ne("id", inSchritt.getId()))
- // .createCriteria("prozess").add(Restrictions.idEq(inSchritt.getProzess().getId())).list();
- // for (Iterator it = bla.iterator(); it.hasNext();) {
- // Schritt s = (Schritt) it.next();
- // }
- // }
-
/* wenn keine offenen parallelschritte vorhanden sind, die nächsten Schritte aktivieren */
if (offeneSchritteGleicherReihenfolge == 0) {
@@ -245,7 +235,7 @@
private void copyOrig(Schritt mySchritt, boolean fullautomatic) throws SwapException, DAOException {
/* Aktion ausführen, bei Fehlern auf offen setzen */
try {
- // File ausgang = new File(mySchritt.getProzess().getTifPfad());
+
File ausgang = new File(mySchritt.getProzess().getImagesDirectory());
File ziel = new File(ausgang.getParent() + File.separator + DIRECTORY_PREFIX + ausgang.getName());
CopyFile.copyDirectory(ausgang, ziel);
@@ -270,15 +260,7 @@
* ================================================================
*/
private void abortStep(Schritt mySchritt, boolean automatic) {
- // try {
- // /* bei einem Fehler den Schritt zurücksetzen */
- // Schritt temp = dao.get(mySchritt.getId());
- // temp.setEditTypeEnum(StepEditType.AUTOMATIC);
- // temp.setBearbeitungsstatusEnum(StepStatus.OPEN);
- // dao.save(temp);
- // } catch (DAOException d) {
- // d.printStackTrace();
- // }
+
mySchritt.setEditTypeEnum(StepEditType.AUTOMATIC);
mySchritt.setBearbeitungsstatusEnum(StepStatus.OPEN);
try {
@@ -302,7 +284,7 @@
logger.error(e);
}
mySchritt.setEditTypeEnum(StepEditType.AUTOMATIC);
- // mySchritt.setBearbeitungsstatusEnum(StepStatus.DONE);
+
SchrittAbschliessen(mySchritt, automatic);
}
=== modified file 'src/de/sub/goobi/helper/Page.java'
--- src/de/sub/goobi/helper/Page.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/Page.java 2012-02-22 14:09:22 +0000
@@ -44,7 +44,7 @@
* @author Eric Broyles
*/
@SuppressWarnings("unchecked")
-public class Page implements Serializable { //implements Iterator
+public class Page implements Serializable {
private static final long serialVersionUID = -290320409344472392L;
//TODO: Use generics
private List results;
@@ -55,43 +55,6 @@
private static final Logger logger = Logger.getLogger(Page.class);
/**
- * Construct a new Page. Page numbers are zero-based, so the first page is
- * page 0.
- *
- * @param query
- * the Hibernate Query
- * @param page
- * the page number (zero-based)
- */
- //TODO: REmove this unused constructor
- /*
- public Page(Query query, int page) {
- this.page = page;
- LoginForm login = (LoginForm) Helper.getManagedBeanValue("#{LoginForm}");
- if (login.getMyBenutzer() == null)
- this.pageSize = 10;
- else
- this.pageSize = login.getMyBenutzer().getTabellengroesse().intValue();
-
- try {
- scrollableResults = query.scroll();
- /*
- * We set the max results to one more than the specfied pageSize to
- * determine if any more results exist (i.e. if there is a next page
- * to display). The result set is trimmed down to just the pageSize
- * before being displayed later (in getList()).
- */
- /*
- results = query.setFirstResult(page * pageSize).setMaxResults(pageSize + 1).list();
- } catch (HibernateException e) {
- //TODO use a logger.
- System.err.println("Failed to get paginated results: " + e.getMessage());
- }
- }
-
-
-
- /**
* Construct a new Page with a Criteria. Page numbers are zero-based, so the
* first page is page 0.
*
@@ -119,17 +82,6 @@
logger.debug("Page-Object is working with a memory stressing Criteria. Try to replace by PaginatingCriteria, if performance or memory is going down");
totalResults = criteria.list().size();
}
- // ScrollableResults scrollableResults = criteria.scroll();
- // scrollableResults.last();
- // totalResults = scrollableResults.getRowNumber() + 1;
-
- /*
- * We set the max results to one more than the specfied pageSize to
- * determine if any more results exist (i.e. if there is a next page
- * to display). The result set is trimmed down to just the pageSize
- * before being displayed later (in getList()).
- */
- // results = criteria.setFirstResult(page * pageSize).setMaxResults(pageSize + 1).list();
} catch (HibernateException e) {
logger.error("Failed to get paginated results: " + e);
}
@@ -142,7 +94,6 @@
* We use the Math.floor() method because page numbers are zero-based
* (i.e. the first page is page 0).
*/
- // double totalResults = new Integer(getTotalResults()).doubleValue();
int rueckgabe = new Double(Math.floor(totalResults / pageSize)).intValue();
if (totalResults % pageSize == 0)
rueckgabe--;
@@ -171,14 +122,6 @@
public int getTotalResults() {
- // try {
- // getScrollableResults().last();
- // totalResults = getScrollableResults().getRowNumber();
- // } catch (HibernateException e) {
- // System.err.println(
- // "Failed to get last row number from scollable results: "
- // + e.getMessage());
- // }
return totalResults;
}
@@ -195,20 +138,6 @@
return getTotalResults() < fullPage ? getTotalResults() : fullPage;
}
- //
- //
- // public int getNextPageNumber() {
- // return page + 1;
- // }
- //
- //
- //
- // public int getPreviousPageNumber() {
- // return page - 1;
- // }
-
-
-
//TODO: Use generics
public List getListReload() {
/*
@@ -311,21 +240,4 @@
return page + 1;
}
- /*
-
- public boolean hasNext() {
- return hasNextPage();
- }
-
- public Object next() {
- this.page++;
- return this;
- }
-
- public void remove() {
- throw new UnsupportedOperationException("Not implemented");
-
- }
- */
-
}
=== modified file 'src/de/sub/goobi/helper/ProjectHelper.java'
--- src/de/sub/goobi/helper/ProjectHelper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/ProjectHelper.java 2012-02-22 14:09:22 +0000
@@ -121,10 +121,6 @@
proList.add(Projections.count("id"));
proList.add(Projections.avg("reihenfolge"));
- // proList.add(Projections.sum("proc.sortHelperImages")); // is not really needed here but will be in the next step
-
- // proList.add(Projections.groupProperty(("bearbeitungsstatus")));
-
critSteps.setProjection(proList);
// now we have to discriminate the hits where the max number of hits doesn't reach numberOfProcs
@@ -290,10 +286,6 @@
proList.add(Projections.count("id"));
proList.add(Projections.avg("reihenfolge"));
- // proList.add(Projections.sum("proc.sortHelperImages")); // is not really needed here but will be in the next step
-
- // proList.add(Projections.groupProperty(("bearbeitungsstatus")));
-
critSteps.setProjection(proList);
// now we have to discriminate the hits where the max number of hits doesn't reach numberOfProcs
=== modified file 'src/de/sub/goobi/helper/ScriptThread.java'
--- src/de/sub/goobi/helper/ScriptThread.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/ScriptThread.java 2012-02-22 14:09:22 +0000
@@ -30,7 +30,7 @@
//TODO: Replace this with a generic container for external tasks.
public class ScriptThread extends Thread {
- // private static final Logger myLogger = Logger.getLogger(AgoraImportThread.class);
+
HelperSchritte hs = new HelperSchritte();
private Schritt mySchritt;
public String rueckgabe = "";
@@ -60,4 +60,4 @@
rueckgabe = "Import wurde wegen Zeitüberschreitung abgebrochen";
stop = true;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/helper/TreeNode.java'
--- src/de/sub/goobi/helper/TreeNode.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/TreeNode.java 2012-02-22 14:09:22 +0000
@@ -57,7 +57,6 @@
public List<TreeNode> getChildrenAsList() {
List<TreeNode> myList = new ArrayList<TreeNode>();
-// getChildrenAsList(myList, 0,new ArrayList(),false);
getChildrenAsListMitStrichen(myList, 0, this, true,true, new ArrayList<TreeNode>());
return myList;
}
=== modified file 'src/de/sub/goobi/helper/UghHelper.java'
--- src/de/sub/goobi/helper/UghHelper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/UghHelper.java 2012-02-22 14:09:22 +0000
@@ -160,7 +160,7 @@
/* wenn kein Wert vorhanden oder das DocStruct null, dann gleich raus */
if (inValue.equals("") || inStruct == null || inStruct.getType() == null)
return;
- // myLogger.debug(inStruct.getType().getName() + " - " + inMetadataType + " - " + inValue);
+
/* andernfalls dem DocStruct das passende Metadatum zuweisen */
MetadataType mdt = inPrefs.getMetadataTypeByName(inMetadataType);
try {
=== modified file 'src/de/sub/goobi/helper/VariableReplacer.java'
--- src/de/sub/goobi/helper/VariableReplacer.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/VariableReplacer.java 2012-02-22 14:09:22 +0000
@@ -61,11 +61,7 @@
DigitalDocument dd;
Prefs prefs;
UghHelper uhelp;
- // Helper help;
- // $(meta.abc)
private final String namespaceMeta = "\\$\\(meta\\.([\\w.]*)\\)";
- // $(abc)
- // private final String namespaceOther = "\\$\\([\\w.]*\\)";
private Prozess process;
private Schritt step;
@@ -78,7 +74,6 @@
dd = inDigitalDocument;
prefs = inPrefs;
uhelp = new UghHelper();
- // help = new Helper();
process = p;
this.step = s;
}
@@ -272,7 +267,6 @@
if (resultFirst == null) {
logger.warn("Can not replace firstChild-variable for METS: " + metadata);
result = "";
- // help.setFehlerMeldung("Can not replace firstChild-variable for METS: " + metadata);
} else
result = resultFirst;
break;
@@ -281,7 +275,6 @@
if (resultTop == null) {
result = "";
logger.warn("Can not replace topStruct-variable for METS: " + metadata);
- // help.setFehlerMeldung("Can not replace topStruct-variable for METS: " + metadata);
} else
result = resultTop;
break;
@@ -294,7 +287,6 @@
} else {
result = "";
logger.warn("Can not replace variable for METS: " + metadata);
- // help.setFehlerMeldung("Can not replace variable for METS: " + metadata);
}
break;
@@ -328,4 +320,4 @@
}
return results;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/helper/WebDav.java'
--- src/de/sub/goobi/helper/WebDav.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/WebDav.java 2012-02-22 14:09:22 +0000
@@ -60,14 +60,12 @@
try {
VerzeichnisAlle = aktuellerBenutzer.getHomeDir() + inVerzeichnis;
- // Helper.setTomcatBenutzerrechte(VerzeichnisAlle);
} catch (Exception ioe) {
myLogger.error("Exception UploadFromHomeAlle()", ioe);
Helper.setFehlerMeldung("UploadFromHomeAlle abgebrochen, Fehler", ioe.getMessage());
return rueckgabe;
}
- // myLogger.debug("Upload-Verzeichnis: " + VerzeichnisAlle);
File benutzerHome = new File(VerzeichnisAlle);
FilenameFilter filter = new FilenameFilter() {
@@ -111,7 +109,6 @@
String myname = (String) it.next();
String command = ConfigMain.getParameter("script_deleteSymLink") + " ";
command += VerzeichnisAlle + myname;
- // myLogger.debug(command);
try {
Runtime.getRuntime().exec(command);
} catch (java.io.IOException ioe) {
@@ -149,7 +146,6 @@
String command = ConfigMain.getParameter("script_deleteSymLink") + " ";
command += benutzerHome;
- // myLogger.debug(command);
try {
// TODO: Use ProcessBuilder
@@ -220,7 +216,6 @@
// Runtime.getRuntime().exec(command);
Helper.callShell2(command);
- // Helper.setMeldung("Verzeichnis in Benutzerhome angelegt: ", processLinkName);
} catch (java.io.IOException ioe) {
myLogger.error("IOException DownloadToHome()", ioe);
Helper.setFehlerMeldung("Download aborted, IOException", ioe.getMessage());
@@ -264,18 +259,4 @@
}
}
- // TODO: Remove this Methods - Use FileUtils, as log as it's still there ;-)
- /*
- * public int getAnzahlImages(String inVerzeichnis) { try { return getAnzahlImages2(new File(inVerzeichnis)); } catch (Exception e) {
- * myLogger.error(e); return 0; } }
- *
- * // Process all files and directories under dir private int getAnzahlImages2(File inDir) { int anzahl = 0; if (inDir.isDirectory()) { // die
- * Images zählen
- *
- * FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".tif"); } }; anzahl =
- * inDir.list(filter).length;
- *
- * //die Unterverzeichnisse durchlaufen String[] children = inDir.list(); for (int i = 0; i < children.length; i++) { anzahl +=
- * getAnzahlImages2(new File(inDir, children[i])); } } return anzahl; }
- */
}
=== modified file 'src/de/sub/goobi/helper/encryption/DesEncrypter.java'
--- src/de/sub/goobi/helper/encryption/DesEncrypter.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/encryption/DesEncrypter.java 2012-02-22 14:09:22 +0000
@@ -97,11 +97,11 @@
// Encode bytes to base64 to get a string
return new String(Base64.encodeBase64(enc));
} catch (BadPaddingException e) {
- // e.printStackTrace();
+
} catch (IllegalBlockSizeException e) {
- // e.printStackTrace();
+
} catch (UnsupportedEncodingException e) {
- // e.printStackTrace();
+
}
return null;
}
=== removed file 'src/de/sub/goobi/helper/encryption/TODO'
--- src/de/sub/goobi/helper/encryption/TODO 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/helper/encryption/TODO 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-//TODO: Remove this package, rely on external libs
-//TODO: This can alse be part of a Auth API
\ No newline at end of file
=== modified file 'src/de/sub/goobi/helper/enums/PropertyType.java'
--- src/de/sub/goobi/helper/enums/PropertyType.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/enums/PropertyType.java 2012-02-22 14:09:22 +0000
@@ -91,7 +91,7 @@
@Override
public java.lang.String toString() {
- return this.name(); //.toLowerCase();
+ return this.name();
}
public static PropertyType getByName(String inName) {
=== modified file 'src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java'
--- src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java 2012-02-22 14:09:22 +0000
@@ -95,7 +95,6 @@
// see comment above
private String err_linkText = "";
- // err_emailEnabled=true;
private String err_emailBody = "";
private String err_emailMessage = "";
=== modified file 'src/de/sub/goobi/helper/ldap/Ldap.java'
--- src/de/sub/goobi/helper/ldap/Ldap.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/ldap/Ldap.java 2012-02-22 14:09:22 +0000
@@ -195,7 +195,6 @@
try {
ctx = new InitialDirContext(env);
Attributes matchAttrs = new BasicAttributes(true);
- // matchAttrs.put(new BasicAttribute("uid", inLogin));
NamingEnumeration<SearchResult> answer = ctx.search("ou=users,dc=gdz,dc=sub,dc=uni-goettingen,dc=de", matchAttrs);
rueckgabe = answer.hasMoreElements();
@@ -317,16 +316,9 @@
env.put(Context.SECURITY_PRINCIPAL, ConfigMain.getParameter("ldap_adminLogin"));
env.put(Context.SECURITY_CREDENTIALS, ConfigMain.getParameter("ldap_adminPassword"));
- // env.put(Context.SECURITY_PRINCIPAL, getUserDN(inBenutzer));
- // env.put(Context.SECURITY_CREDENTIALS, inOldPassword);
try {
DirContext ctx = new InitialDirContext(env);
- // /* vorher ausgeben */
- // Attributes attrs = ctx.getAttributes(ldapUserName);
- // Attribute la = (Attribute) attrs.get("userPassword");
- // byte[] passwdhash = (byte[]) la.get(0);
-
/*
* -------------------------------- Encryption of password and Base64-Encoding --------------------------------
*/
@@ -424,7 +416,6 @@
// TODO: Let this method really load a keystore if configured
// initalize the keystore, if file is available, load the keystore
ks.load(null);
- // ks.load(ksis,password);
ks.setCertificateEntry("ROOTCERT", cacert);
ks.setCertificateEntry("PDC", servercert);
=== modified file 'src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java'
--- src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2012-02-22 14:09:22 +0000
@@ -40,7 +40,6 @@
// TODO: Previous Hibernate-Filter for old manual Hibernate-Session-Management, old version, reactivated, because
// de.sub.goobi.persistence.HibernateSessionConversationFilter does not work like it should
public class HibernateSessionFilter2 implements Filter {
- // private static final Logger mylogger = Logger.getLogger(HibernateSessionFilter2.class);
public void init(FilterConfig filterConfig) throws ServletException {
}
@@ -49,7 +48,7 @@
@SuppressWarnings("deprecation")
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- // long startzeit = System.currentTimeMillis();
+
HttpServletRequest myRequest = (HttpServletRequest) request;
HibernateSessionLong hsl = null;
Session session = null;
@@ -86,7 +85,6 @@
if (session != null && session.isConnected())
session.disconnect();
}
- // mylogger.debug("Requestzeit: " + (System.currentTimeMillis() - startzeit) + " ms");
}
}
=== modified file 'src/de/sub/goobi/helper/servletfilter/RequestControlFilter.java'
--- src/de/sub/goobi/helper/servletfilter/RequestControlFilter.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/servletfilter/RequestControlFilter.java 2012-02-22 14:09:22 +0000
@@ -71,10 +71,6 @@
*/
public class RequestControlFilter implements Filter {
- // initialize logging
- // private static final Logger log =
- // Logger.getLogger(RequestControlFilter.class);
-
/**
* Initialize this filter by reading its configuration parameters
*
@@ -170,11 +166,6 @@
Helper.setFehlerMeldung(de.sub.goobi.helper.Helper.getTranslation("aLazyInitializationErrorOcurred"));
}
- /*
- * } catch (Exception e) { new Helper() .setFehlerMeldung(de.sub.goobi.helper.Helper .getTranslation("anUnknownErrorOcurred"));
- *
- * }
- */
finally {
releaseQueuedRequest(httpRequest);
}
@@ -352,4 +343,4 @@
/** The default maximum number of milliseconds to wait for a request */
private final static long DEFAULT_DURATION = 5000;
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java'
--- src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2012-02-22 14:09:22 +0000
@@ -45,7 +45,7 @@
public class SessionCounterFilter implements Filter {
- // private static final Logger mylogger = Logger.getLogger(SessionCounterFilter.class);
+
ServletContext servletContext;
public void init(FilterConfig filterConfig) throws ServletException {
@@ -59,21 +59,6 @@
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
- // /* --------------------------------
- // * den Session-Counter aktualisieren
- // * --------------------------------*/
- // HttpServletRequest httpReq = (HttpServletRequest) request;
- // SessionForm backingBean = (SessionForm) httpReq.getSession().getAttribute("SessionForm");
- // // is the backing bean already in the session?
- // if (backingBean != null) {
- // backingBean.sessionAktualisieren(httpReq.getSession());
- // } else {
- // // create the backing bean and put it in the session
- // backingBean = new SessionForm();
- // // backingBean.setOclcNum(oclcNum);
- // httpReq.getSession().setAttribute("SessionForm", backingBean);
- // }
-
/* --------------------------------
* den Session-Counter aktualisieren - 2. Versuch
* --------------------------------*/
=== modified file 'src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java'
--- src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2012-02-22 14:09:22 +0000
@@ -206,16 +206,6 @@
}
/**************************************************************************************
- * Setter for tempFolder
- *
- * @param tempFolder
- * the tempFolder to set
- **************************************************************************************/
-/* public void setTempFolder(File tempFolder) {
- this.tempFolder = tempFolder;
- }
-*/
- /**************************************************************************************
* Setter for targetFolder
*
* @param targetFolder
=== modified file 'src/de/sub/goobi/helper/tasks/LongRunningTaskManager.java'
--- src/de/sub/goobi/helper/tasks/LongRunningTaskManager.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/tasks/LongRunningTaskManager.java 2012-02-22 14:09:22 +0000
@@ -29,7 +29,7 @@
public class LongRunningTaskManager {
static LinkedList<LongRunningTask> tasks = new LinkedList<LongRunningTask>();
private static LongRunningTaskManager lrtm;
-// Helper help = new Helper();
+
static boolean running = false;
Timer autoRunTimer;
=== modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java'
--- src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2012-02-22 14:09:22 +0000
@@ -51,7 +51,7 @@
@SuppressWarnings("unchecked")
public void run() {
setStatusProgress(5);
- // Helper help = new Helper();
+
String swapPath = null;
ProzessDAO dao = new ProzessDAO();
String processDirectory = "";
@@ -192,7 +192,6 @@
setStatusMessage("done");
setStatusProgress(100);
- // Helper.getHibernateSession().close();
}
}
=== modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java'
--- src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2012-02-22 14:09:22 +0000
@@ -160,7 +160,6 @@
}
setStatusMessage("done");
setStatusProgress(100);
- //Helper.getHibernateSession().close();
}
}
=== modified file 'src/de/sub/goobi/helper/tasks/TiffWriterTask.java'
--- src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2012-02-22 14:09:22 +0000
@@ -103,16 +103,5 @@
inFiles.addAll(Arrays.asList(tiffiles));
}
- //Draft
- /*
- public static List<File> listAllFiles (File dir, String extension) {
- if (!dir.isDirectory()) {
- throw new IllegalStateException("Expected a directory, got: " dir.getAbsolutePath());
- }
- List<File> files = new ArrayList<File>();
-
-
- return files;
- }
- */
+
}
=== modified file 'src/de/sub/goobi/importer/Import.java'
--- src/de/sub/goobi/importer/Import.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/importer/Import.java 2012-02-22 14:09:22 +0000
@@ -50,9 +50,6 @@
private static final Logger myLogger = Logger.getLogger(Import.class);
private String importFehler = "";
private String importMeldung = "";
- // private Integer importArt;
- // private Integer prozessID;
- // private Prozess prozess;
private Schritt mySchritt;
private UploadedFile upDatei;
@@ -67,7 +64,6 @@
importFehler = "";
importMeldung = "";
try {
- // Einlesen(prozessID.toString());
Einlesen();
} catch (Exception e) {
importFehler = "An error occured: " + e.getMessage();
@@ -148,27 +144,4 @@
this.mySchritt = mySchritt;
}
- // public Integer getImportArt() {
- // return importArt;
- // }
- //
- // public void setImportArt(Integer inimportArt) {
- // importArt = inimportArt;
- // }
-
- // public Prozess getProzess() {
- // return prozess;
- // }
- //
- // public void setProzess(Prozess prozess) {
- // this.prozess = prozess;
- // }
-
- // public Integer getProzessID() {
- // return prozessID;
- // }
- //
- // public void setProzessID(Integer prozessID) {
- // this.prozessID = prozessID;
- // }
}
=== modified file 'src/de/sub/goobi/importer/ImportOpac.java'
--- src/de/sub/goobi/importer/ImportOpac.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/importer/ImportOpac.java 2012-02-22 14:09:22 +0000
@@ -109,7 +109,7 @@
* Multivolume-Bandes ist, dann das Sammelwerk überordnen
* --------------------------------
*/
- // if (isMultivolume()) {
+
if (getOpacDocType().isMultiVolume()) {
/* Sammelband-PPN ermitteln */
String multiVolumePpn = getPpnFromParent(myFirstHit, "036D", "9");
@@ -125,20 +125,9 @@
/* Konvertierung in jdom-Elemente */
Document myJdomDocMultivolumeband = new DOMBuilder().build(myParentHitlist.getOwnerDocument());
- /* Testausgabe */
- // XMLOutputter outputter = new XMLOutputter();
- // FileOutputStream output = new
- // FileOutputStream("D:/fileParent.xml");
- // outputter.output(myJdomDocMultivolumeband.getRootElement(),
- // output);
- /* dem Rootelement den Volume-Treffer hinzufügen */
myFirstHit.getParent().removeContent(myFirstHit);
myJdomDocMultivolumeband.getRootElement().addContent(myFirstHit);
- /* Testausgabe */
- // output = new FileOutputStream("D:/fileFull.xml");
- // outputter.output(myJdomDocMultivolumeband.getRootElement(),
- // output);
myJdomDoc = myJdomDocMultivolumeband;
myFirstHit = myJdomDoc.getRootElement().getChild("record");
@@ -173,16 +162,7 @@
/* Konvertierung in jdom-Elemente */
Document myJdomDocParent = new DOMBuilder().build(myParentHitlist.getOwnerDocument());
Element myFirstHitParent = myJdomDocParent.getRootElement().getChild("record");
- /* Testausgabe */
- // XMLOutputter outputter = new XMLOutputter();
- // FileOutputStream output = new
- // FileOutputStream("D:/fileParent.xml");
- // outputter.output(myJdomDocParent.getRootElement(),
- // output);
- /*
- * alle Elemente des Parents übernehmen, die noch nicht
- * selbst vorhanden sind
- */
+
if (myFirstHitParent.getChildren() != null) {
for (Iterator iter = myFirstHitParent.getChildren().iterator(); iter.hasNext();) {
@@ -199,12 +179,6 @@
* -------------------------------- aus Opac-Ergebnis RDF-Datei erzeugen
* --------------------------------
*/
- /* XML in Datei schreiben */
-// XMLOutputter outputter = new XMLOutputter();
-// FileOutputStream output = new FileOutputStream("c:/Temp/temp_opac.xml");
-// outputter.output(myJdomDoc.getRootElement(), output);
- /* myRdf temporär in Datei schreiben */
- // myRdf.write("D:/temp.rdf.xml");
/* zugriff auf ugh-Klassen */
PicaPlus pp = new PicaPlus(inPrefs);
@@ -218,7 +192,7 @@
dd.setPhysicalDocStruct(dsBoundBook);
/* Inhalt des RDF-Files überprüfen und ergänzen */
checkMyOpacResult(ff.getDigitalDocument(), inPrefs, myFirstHit);
- // rdftemp.write("D:/PicaRdf.xml");
+
return ff;
}
@@ -234,7 +208,7 @@
for (Iterator<Element> iter = inHit.getChildren().iterator(); iter.hasNext();) {
Element tempElement = (Element) iter.next();
String feldname = tempElement.getAttributeValue("tag");
- // System.out.println(feldname);
+
if (feldname.equals("002@"))
return getSubelementValue(tempElement, "0");
}
@@ -265,7 +239,7 @@
for (Iterator<Element> iter = inHit.getChildren().iterator(); iter.hasNext();) {
Element tempElement = (Element) iter.next();
String feldname = tempElement.getAttributeValue("tag");
- // System.out.println(feldname);
+
if (feldname.equals(inFeldName))
return getSubelementValue(tempElement, inSubElement);
}
@@ -295,7 +269,6 @@
* -------------------------------- bei Multivolumes noch das Child in
* xml und docstruct ermitteln --------------------------------
*/
- // if (isMultivolume()) {
if (getOpacDocType().isMultiVolume()) {
try {
topstructChild = topstruct.getAllChildren().get(0);
@@ -367,7 +340,6 @@
if (sortingTitleMulti.indexOf("@") != -1)
sortingTitleMulti = sortingTitleMulti.substring(sortingTitleMulti.indexOf("@") + 1);
ughhelp.replaceMetadatum(topstructChild, inPrefs, "TitleDocMainShort", sortingTitleMulti);
- // sortingTitle = sortingTitleMulti;
}
/*
@@ -464,7 +436,6 @@
* -------------------------------- bei Zeitschriften noch ein
* PeriodicalVolume als Child einfügen --------------------------------
*/
- // if (isPeriodical()) {
if (getOpacDocType().isPeriodical()) {
try {
DocStructType dstV = inPrefs.getDocStrctTypeByName("PeriodicalVolume");
@@ -503,7 +474,6 @@
* -------------------------------- bei Zeitschriften Tsl berechnen
* --------------------------------
*/
- // if (gattung.startsWith("ab") || gattung.startsWith("ob")) {
if (autor == null || autor.equals("")) {
myAtsTsl = "";
StringTokenizer tokenizer = new StringTokenizer(myTitle);
@@ -542,7 +512,7 @@
for (Iterator<Element> iter2 = inHit.getChildren().iterator(); iter2.hasNext();) {
Element myElement = (Element) iter2.next();
String feldname = myElement.getAttributeValue("tag");
- // System.out.println(feldname);
+
/*
* wenn es das gesuchte Feld ist, dann den Wert mit dem passenden
* Attribut zurückgeben
@@ -620,38 +590,6 @@
* #####################################################
* ####################################################
*/
-
- // public boolean isMonograph() {
- // if (gattung != null && config.getParameter("docTypeMonograph",
- // "").contains(gattung.substring(0, 2)))
- // return true;
- // else
- // return false;
- // }
- // public boolean isPeriodical() {
- // if (gattung != null && config.getParameter("docTypePeriodical",
- // "").contains(gattung.substring(0, 2)))
- // return true;
- // else
- // return false;
- // }
- //
- // public boolean isMultivolume() {
- // if (gattung != null && config.getParameter("docTypeMultivolume",
- // "").contains(gattung.substring(0, 2)))
- // return true;
- // else
- // return false;
- // }
- //
- // public boolean isContainedWork() {
- // if (gattung != null
- // && config.getParameter("docTypeContainedWork",
- // "").contains(gattung.substring(0, 2)))
- // return true;
- // else
- // return false;
- // }
public ConfigOpacDoctype getOpacDocType() {
try {
ConfigOpac co = new ConfigOpac();
@@ -669,4 +607,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/importer/ImportRussland.java'
--- src/de/sub/goobi/importer/ImportRussland.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/importer/ImportRussland.java 2012-02-22 14:09:22 +0000
@@ -99,7 +99,7 @@
String line = reader.readLine();
line = reader.readLine();
line = reader.readLine();
- // myLogger.info(line + " : " + myProzesseID);
+
if (line == null)
throw new WrongImportFileException("Importfehler: ungültige Importdatei oder falsche Kodierung");
@@ -115,10 +115,6 @@
mydocument = gdzfile.getDigitalDocument();
logicalTopstruct = mydocument.getLogicalDocStruct();
RussischeDatenLoeschen(logicalTopstruct);
- // if (1 == 1) {
- // gdzfile.Write(help.metadatenverzeichnis() + myProzesseID + "/meta.xml");
- // return;
- // }
/* --------------------------------
* alle Zeilen durchlaufen
@@ -176,7 +172,6 @@
for (Iterator<String> iter = inListe.iterator(); iter.hasNext();) {
String meinDetail = (String) iter.next();
String meineDetailNr = meinDetail.substring(0, 3);
- // myLogger.debug("---- " + meinDetail);
/* Zeitschrift Titel russisch */
if (meineDetailNr.equals("020"))
@@ -201,7 +196,7 @@
private void BandDetails(List<String> inListe) throws MetadataTypeNotAllowedException {
DocStruct ds = logicalTopstruct.getAllChildren().get(0);
- // myLogger.info(ds.getType().getName());
+
/* zunächst alle Details durchlaufen und dem Band hinzufügenl */
for (Iterator<String> iter = inListe.iterator(); iter.hasNext();) {
String meinDetail = (String) iter.next();
@@ -231,23 +226,19 @@
for (Iterator<String> iter = inListe.iterator(); iter.hasNext();) {
String meinDetail = (String) iter.next();
if (meinDetail.substring(0, 3).equals("090")) {
-// myLogger.info("ZBL-Identifier ist " + meinDetail.substring(4).trim());
+
zblID = meinDetail.substring(4).trim();
break;
}
}
- /* für das Debugging bei Problemen */
-// if (zblID.equals("0843.11050"))
-// myLogger.warn("gesuchte ID");
-
/* --------------------------------
* alle Hefte und Artikel durchlaufen und den richtigen Artikel mit der selben ZBL-ID finden
* --------------------------------*/
MetadataType mdt_id = prozess.getRegelsatz().getPreferences().getMetadataTypeByName("ZBLIdentifier");
MetadataType mdt_tempId = prozess.getRegelsatz().getPreferences().getMetadataTypeByName("ZBLTempID");
DocStruct band = logicalTopstruct.getAllChildren().get(0);
- // myLogger.info(band.getType().getName());
+
List<DocStruct> listHefte = band.getAllChildren();
if (listHefte != null) {
for (Iterator<DocStruct> iter = listHefte.iterator(); iter.hasNext();) {
@@ -258,16 +249,16 @@
/* jetzt alle Artikel durchlaufen, bis der richtige Artikel gefunden wurde */
for (Iterator<DocStruct> iter1 = listArtikel.iterator(); iter1.hasNext();) {
DocStruct artikel = (DocStruct) iter1.next();
-// myLogger.info(artikel.getType().getName());
+
if (artikel.getAllMetadataByType(mdt_id).size() > 0 || artikel.getAllMetadataByType(mdt_tempId).size() > 0) {
Metadata md;
if (artikel.getAllMetadataByType(mdt_id).size() > 0)
md = artikel.getAllMetadataByType(mdt_id).get(0);
else
md = artikel.getAllMetadataByType(mdt_tempId).get(0);
- // myLogger.debug(md.getValue());
+
if (md.getValue().equals(zblID)) {
- // myLogger.info("------------ Artikel gefunden -------------");
+
artikelGefunden = true;
/* jetzt alle Details durchlaufen und dem Artikel hinzufügenl */
for (Iterator<String> iter2 = inListe.iterator(); iter2.hasNext();) {
@@ -374,21 +365,6 @@
try {
md.setValue(inDetail.substring(4).trim());
- /* --------------------------------
- * prüfen, ob das Metadatum schon existiert, wenn nein, neu anlegen
- * --------------------------------*/
-
- // LinkedList list = inStruct.getAllChildren();
- // if (list != null) {
- //
- // /* jetzt alle Artikel durchlaufen, bis der richtige Artikel gefunden wurde */
- // for (Iterator iter1 = listArtikel.iterator(); iter1.hasNext();) {
- // DocStruct artikel = (DocStruct) iter1.next();
- // Metadata md = (Metadata) artikel.getAllMetadataByType(mdt).getFirst();
- // myLogger.debug(md.getValue());
- // if (md.getValue().equals(zblID)) {
- // myLogger.info("------------ Artikel gefunden -------------");
- //
inStruct.addMetadata(md);
} catch (Exception e) {
myLogger.error("Import fehlgeschlagen: " + inDetail, e);
@@ -407,8 +383,7 @@
p.setLastname(pName.substring(0, pName.indexOf(",")).trim());
p.setFirstname(pName.substring(pName.indexOf(",") + 1, pName.length()).trim());
p.setRole(inRole);
-// MetadataType mdt = prozess.getRegelsatz().getPreferences().getMetadataTypeByName(inRole);
-// p.setType(mdt);
+
inStruct.addPerson(p);
}
}
=== modified file 'src/de/sub/goobi/importer/ImportZentralblatt.java'
--- src/de/sub/goobi/importer/ImportZentralblatt.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/importer/ImportZentralblatt.java 2012-02-22 14:09:22 +0000
@@ -102,7 +102,6 @@
* -------------------------------- alle Zeilen durchlaufen --------------------------------
*/
while ((line = reader.readLine()) != null) {
- // myLogger.debug(line);
/*
* -------------------------------- wenn die Zeile leer ist, ist es das Ende eines Absatzes --------------------------------
@@ -122,7 +121,7 @@
DocStructType dstLocal = myPrefs.getDocStrctTypeByName("Article");
DocStruct ds = dd.createDocStruct(dstLocal);
listArtikel.add(ds);
- // myLogger.debug("--------------- neuer Artikel ----------------");
+
istAbsatz = true;
istErsterTitel = true;
}
@@ -175,7 +174,6 @@
/*
* -------------------------------- jetzt die Gesamtstruktur bauen und in xml schreiben --------------------------------
*/
- // DigitalDocument dd = new DigitalDocument();
dd.setLogicalDocStruct(dsPeriodical);
dd.setPhysicalDocStruct(dsBoundBook);
try {
@@ -244,9 +242,9 @@
List<DocStruct> myList = dsPeriodicalVolume.getAllChildrenByTypeAndMetadataType("PeriodicalIssue", "CurrentNo");
if (myList != null && myList.size() != 0) {
for (DocStruct dsIntern : myList) {
- // myLogger.debug(dsIntern.getAllMetadataByType(mdt).getFirst());
+
Metadata myMD1 = dsIntern.getAllMetadataByType(mdt).get(0);
- // myLogger.debug("und der Wert ist: " + myMD1.getValue());
+
if (myMD1.getValue().equals(myRight))
dsPeriodicalIssue = dsIntern;
}
@@ -256,7 +254,7 @@
dst = myPrefs.getDocStrctTypeByName("PeriodicalIssue");
dsPeriodicalIssue = inDigitalDocument.createDocStruct(dst);
Metadata myMD = new Metadata(mdt);
- // myMD.setType(mdt);
+
myMD.setValue(myRight);
dsPeriodicalIssue.addMetadata(myMD);
dsPeriodicalVolume.addChild(dsPeriodicalIssue);
@@ -275,17 +273,9 @@
private void ParsenAllgemein(DocStruct inStruct, String myLeft, String myRight) throws WrongImportFileException,
TypeNotAllowedForParentException, MetadataTypeNotAllowedException {
- // myLogger.debug(myLeft);
- // myLogger.debug(myRight);
- // myLogger.debug("---");
Metadata md;
MetadataType mdt;
- // J: Zeitschrift
- // V: Band
- // I: Heft
- // Y: Jahrgang
-
/*
* -------------------------------- Zeitschriftenname --------------------------------
*/
@@ -295,7 +285,7 @@
/* wenn noch kein Zeitschrifenname vergeben wurde, dann jetzt */
if (myList.size() == 0) {
md = new Metadata(mdt);
- // md.setType(mdt);
+
md.setValue(myRight);
inStruct.addMetadata(md);
} else {
@@ -318,7 +308,7 @@
/* wenn noch kein Zeitschrifenname vergeben wurde, dann jetzt */
if (myList.size() == 0) {
md = new Metadata(mdt);
- // md.setType(mdt);
+
md.setValue(myRight);
inStruct.addMetadata(md);
} else {
@@ -326,13 +316,6 @@
/* wurde schon ein Zeitschriftenname vergeben, prüfen, ob dieser genauso lautet */
md = myList.get(0);
- /*
- * -------------------------------- da Frau Jansch ständig Importprobleme mit jahrübergreifenden Bänden hat, jetzt mal auskommentiert
- * --------------------------------
- */
- // if (!myRight.equals(md.getValue()))
- // throw new WrongImportFileException("Parsingfehler: verschiedene Jahresangaben in der Datei ('"
- // + md.getValue() + "' & '" + myRight + "')");
}
return;
}
@@ -370,24 +353,10 @@
*/
private void ParsenArtikel(DocStruct inStruct, String myLeft, String myRight, boolean istErsterTitel) throws MetadataTypeNotAllowedException,
WrongImportFileException {
- // myLogger.debug(myLeft);
- // myLogger.debug(myRight);
- // myLogger.debug("---");
+
Metadata md;
MetadataType mdt;
- // J: Zeitschrift
- // V: Band
- // I: Heft
- // Y: Jahrgang
- // SO: Quelle (fuer uns intern)
- // AR: Author (Referenz)
- // BR: Biographische Referenz
- // AB: Abstract-Review
- // DE: Vorlaeufige AN-Nummer (eher fuer uns intern)
- // SI: Quellenangabe für Rezension im Zentralblatt
- //
-
/*
* -------------------------------- erledigt
*
=== modified file 'src/de/sub/goobi/metadaten/MetaPerson.java'
--- src/de/sub/goobi/metadaten/MetaPerson.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/metadaten/MetaPerson.java 2012-02-22 14:09:22 +0000
@@ -53,7 +53,7 @@
* Allgemeiner Konstruktor ()
*/
public MetaPerson(Person p, int inID, Prefs inPrefs, DocStruct inStruct) {
- // myLogger.debug("MetaPerson p() - Konstruktor: Start -" + inID);
+
myPrefs = inPrefs;
this.p = p;
identifier = inID;
=== modified file 'src/de/sub/goobi/metadaten/Metadaten.java'
--- src/de/sub/goobi/metadaten/Metadaten.java 2012-02-21 09:05:25 +0000
+++ src/de/sub/goobi/metadaten/Metadaten.java 2012-02-22 14:09:22 +0000
@@ -103,14 +103,14 @@
private DigitalDocument mydocument;
private Prozess myProzess;
private Prefs myPrefs;
- // private String myProzesseID;
+
private String myBenutzerID;
private String tempTyp;
private String tempWert;
private String tempPersonVorname;
private String tempPersonNachname;
private String tempPersonRolle;
- // private String myProzessTitel;
+
private String currentTifFolder;
private List<String> allTifFolders;
/* Variablen für die Zuweisung der Seiten zu Strukturelementen */
@@ -222,7 +222,7 @@
}
public String Reload() {
- // MetadatenDebuggen(gdzfile.getDigitalDocument().getLogicalDocStruct());
+
if (!SperrungAktualisieren()) {
return "SperrungAbgelaufen";
} else {
@@ -273,8 +273,6 @@
}
public String ChangeCurrentDocstructType() {
- // myStrukturelement.getType().getName()
- // + " soll werden zu " + tempWert);
if (myDocStruct != null && tempWert != null) {
try {
@@ -345,20 +343,12 @@
per.setLastname(tempPersonNachname);
per.setRole(tempPersonRolle);
- // MetadataType mdt =
- // myPrefs.getMetadataTypeByName(tempPersonRolle);
- // per.setType(mdt);
-
myDocStruct.addPerson(per);
} catch (IncompletePersonObjectException e) {
Helper.setFehlerMeldung("Incomplete data for person", "");
- // myLogger.error("Fehler beim Hinzufügen von Personen (IncompletePersonObjectException): "
- // + e.getMessage());
return "";
- // e.printStackTrace();
} catch (MetadataTypeNotAllowedException e) {
Helper.setFehlerMeldung("Person is for this structure not allowed", "");
- // myLogger.error("Fehler beim Hinzufügen von Personen(MetadataTypeNotAllowedException): + e.getMessage()");
return "";
}
modusHinzufuegenPerson = false;
@@ -477,7 +467,6 @@
List<MetadataType> types = myDocStruct.getAddableMetadataTypes();
if (types == null) {
- // SelectItem myTypen[] = new SelectItem[0];
return new SelectItem[0];
}
@@ -500,8 +489,6 @@
zaehler = 0;
for (MetadataType mdt : types) {
- // myTypen[zaehler] = new SelectItem(mdt.getName(),
- // mdt.getLanguage("rusdml"));
myTypen[zaehler] = new SelectItem(mdt.getName(), metahelper.getMetadatatypeLanguage(mdt));
zaehler++;
@@ -528,8 +515,6 @@
*/
public String XMLlesen() {
- // myProzesseID = Helper.getRequestParameter("ProzesseID");
-
/*
* re-reading the ruleset.xml file
*/
@@ -631,7 +616,6 @@
BildErmitteln(0);
retrieveAllImages();
- // MetadatenImLogAusgeben(logicalTopstruct);
MetadatenalsBeanSpeichern(logicalTopstruct);
MetadatenalsTree3Einlesen1();
@@ -641,24 +625,10 @@
}
/**
- * Metadaten Einlesen
- *
- * @throws ReadException
- * @throws InterruptedException
- * @throws IOException
- * @throws PreferencesException
- * ============================================================== ==
- * @throws DAOException
- * @throws SwapException
- * @throws WriteException
- */
-
- /**
* Metadaten Schreiben
*
* @throws InterruptedException
* @throws IOException
- * ============================================================== ==
* @throws DAOException
* @throws SwapException
* @throws WriteException
@@ -682,8 +652,7 @@
Helper.setFehlerMeldung("error while counting current images", e);
myLogger.error(e);
}
- /* xml-Datei speichern */
- // MetadatenDebuggen(gdzfile.getDigitalDocument().getLogicalDocStruct());
+
/*
* --------------------- vor dem Speichern alle ungenutzen Docstructs rauswerfen -------------------
*/
@@ -713,16 +682,6 @@
LinkedList<MetaPerson> lsPers = new LinkedList<MetaPerson>();
/*
- * -------------------------------- alle Metadaten ermitteln --------------------------------
- */
- // if (inStrukturelement != null &&
- // inStrukturelement.getAllVisibleMetadata() != null
- // && inStrukturelement.getAllMetadata().size() > 0) {
- // for (Iterator iter = inStrukturelement.getAllMetadata().iterator();
- // iter.hasNext();)
- // lsMeta.add(new Metadatum((Metadata) iter.next(), 0, myPrefs));
- // }
- /*
* -------------------------------- alle Metadaten und die DefaultDisplay-Werte anzeigen --------------------------------
*/
List<? extends Metadata> myTempMetadata = metahelper.getMetadataInclDefaultDisplay(inStrukturelement, (String) Helper
@@ -732,16 +691,6 @@
lsMeta.add(new MetadatumImpl(metadata, 0, myPrefs, myProzess));
/*
- * -------------------------------- alle Personen ermitteln --------------------------------
- */
- // if (inStrukturelement != null && inStrukturelement.getAllPersons() !=
- // null
- // && inStrukturelement.getAllPersons().size() > 0) {
- // for (Iterator iter = inStrukturelement.getAllPersons().iterator();
- // iter.hasNext();)
- // lsPers.add(new MetaPerson((Person) iter.next(), 0, myPrefs));
- // }
- /*
* -------------------------------- alle Personen und die DefaultDisplay-Werte ermitteln --------------------------------
*/
myTempMetadata = metahelper.getMetadataInclDefaultDisplay(inStrukturelement, (String) Helper
@@ -848,7 +797,6 @@
TreeNodeStruct3 tns = new TreeNodeStruct3(label, kind);
zaehler++;
OberKnoten.addChild(tns);
- // MetadatenDebuggen(kind);
MetadatenalsTree3Einlesen2(kind, tns);
}
}
@@ -872,20 +820,6 @@
return rueckgabe.trim();
}
- // /**
- // * Metadaten debuggen
- // *
- // * @param inStrukturelement
- // * ================================================================
- // */
- // private void MetadatenDebuggen(DocStruct inStrukturelement) {
- // myLogger.info("--------------------------- " + inStrukturelement.getType().getName() + " -------------------------------------------------");
- // List<Metadata> allMDs = inStrukturelement.getAllMetadata();
- // if (allMDs != null)
- // for (Metadata md : allMDs)
- // myLogger.info(md.getType().getName() + ": " + md.getValue());
- // }
-
@SuppressWarnings("unchecked")
public void setMyStrukturelement(DocStruct inStruct) {
modusHinzufuegen = false;
@@ -977,9 +911,6 @@
*/
@SuppressWarnings("unchecked")
public String KnotenAdd() throws TypeNotAllowedForParentException, TypeNotAllowedAsChildException {
- // myLogger.warn("eingefügt wird: " + neuesElementWohin);
- // myLogger.warn("eingefügt wird was: " + addDocStructType1 + " - " +
- // addDocStructType2);
/*
* -------------------------------- prüfen, wohin das Strukturelement gepackt werden soll, anschliessend entscheiden, welches Strukturelement
@@ -1027,7 +958,7 @@
for (Iterator iter = alleDS.iterator(); iter.hasNext();) {
parent.addChild((DocStruct) iter.next());
}
- // myStrukturelement =ds;
+
}
/*
@@ -1061,7 +992,7 @@
for (Iterator iter = alleDS.iterator(); iter.hasNext();) {
parent.addChild((DocStruct) iter.next());
}
- // myStrukturelement =ds;
+
}
/*
@@ -1087,7 +1018,7 @@
for (Iterator iter = alleDS.iterator(); iter.hasNext();) {
parent.addChild((DocStruct) iter.next());
}
- // myStrukturelement =ds;
+
}
/*
@@ -1097,7 +1028,7 @@
DocStructType dst = myPrefs.getDocStrctTypeByName(addDocStructType2);
ds = mydocument.createDocStruct(dst);
myDocStruct.addChild(ds);
- // myStrukturelement =ds;
+
}
if (!pagesStart.equals("") && !pagesEnd.equals("")) {
@@ -1107,8 +1038,6 @@
ajaxSeiteEnde = pagesEnd;
AjaxSeitenStartUndEndeSetzen();
myDocStruct = temp;
-// pagesStart = pagesEnd;
-// pagesEnd = "";
}
return MetadatenalsTree3Einlesen1();
@@ -1232,9 +1161,8 @@
}
/*
- * Wenn eine Verkn�pfung zwischen Strukturelement und Bildern sein soll, das richtige Bild anzeigen
+ * Wenn eine Verknüpfung zwischen Strukturelement und Bildern sein soll, das richtige Bild anzeigen
*/
- // myLogger.info("erste Seite ist Image " + imageNr);
if (bildZuStrukturelement)
BildErmitteln(imageNr - myBildNummer);
}
@@ -1414,7 +1342,6 @@
FacesContext context = FacesContext.getCurrentInstance();
HttpSession session = (HttpSession) context.getExternalContext().getSession(false);
return ConfigMain.getTempImagesPath() + session.getId() + "_" + myBildCounter + ".png";
- // return myBildCounter + ".png";
}
public List<String> getAllTifFolders() throws IOException, InterruptedException {
@@ -1504,13 +1431,11 @@
* den Counter für die Bild-ID auf einen neuen Wert setzen, damit nichts gecacht wird
*/
myBildCounter++;
- // if (myBildCounter > 2) myBildCounter = 0;
/* Session ermitteln */
FacesContext context = FacesContext.getCurrentInstance();
HttpSession session = (HttpSession) context.getExternalContext().getSession(false);
String mySession = session.getId() + "_" + myBildCounter + ".png";
- // String mySession = myBildCounter + ".png";
/* das neue Bild zuweisen */
try {
@@ -1639,8 +1564,7 @@
MetadataType mdtIso = myPrefs.getMetadataTypeByName("AuthorTransliteratedISO");
Person mdDin = new Person(mdtDin);
Person mdIso = new Person(mdtIso);
- // mdDin.setType(mdtDin);
- // mdIso.setType(mdtIso);
+
mdDin.setFirstname(trans.transliterate_din(md.getFirstname()));
mdDin.setLastname(trans.transliterate_din(md.getLastname()));
mdIso.setFirstname(trans.transliterate_iso(md.getFirstname()));
@@ -1674,7 +1598,7 @@
*/
public String AddAdditionalOpacPpns() {
ImportOpac iopac = new ImportOpac();
- // Helper.setMeldung(null, "Opac abgefragt: ", "kein Ergebnis");
+
StringTokenizer tokenizer = new StringTokenizer(additionalOpacPpns, "\r\n");
while (tokenizer.hasMoreTokens()) {
String tok = tokenizer.nextToken();
@@ -1852,8 +1776,6 @@
SeitenStartUndEndeSetzen();
} else {
Helper.setFehlerMeldung("Selected image(s) unavailable");
- // Helper.setFehlerMeldung("suggestFehler","",
- // "Selected image(s) unavailable");
}
}
@@ -1864,15 +1786,12 @@
if (!SperrungAktualisieren())
return "SperrungAbgelaufen";
int anzahlAuswahl = Integer.parseInt(alleSeitenAuswahl_letzteSeite) - Integer.parseInt(alleSeitenAuswahl_ersteSeite) + 1;
- // myLogger.debug("Anzahl der gewählten Seiten: " + anzahlAuswahl);
+
if (anzahlAuswahl > 0) {
/* alle bisher zugewiesenen Seiten entfernen */
myDocStruct.getAllToReferences().clear();
int zaehler = 0;
while (zaehler < anzahlAuswahl) {
- // alleSeitenAuswahl[zaehler]=
- // String.valueOf(Integer.parseInt(alleSeitenAuswahl_ersteSeite)
- // + zaehler);
myDocStruct.addReferenceTo(alleSeitenNeu[Integer.parseInt(alleSeitenAuswahl_ersteSeite) + zaehler].getMd().getDocStruct(),
"logical_physical");
zaehler++;
@@ -1945,7 +1864,6 @@
/* alle markierten Seiten durchlaufen */
for (int i = 0; i < alleSeitenAuswahl.length; i++) {
int aktuelleID = Integer.parseInt(alleSeitenAuswahl[i]);
- // myLogger.info(alleSeitenNeu[aktuelleID].getWert());
boolean schonEnthalten = false;
@@ -1977,9 +1895,9 @@
*/
public String SeitenWeg() {
for (int i = 0; i < structSeitenAuswahl.length; i++) {
- // myLogger.info(structSeitenAuswahl[i]);
+
int aktuelleID = Integer.parseInt(structSeitenAuswahl[i]);
- // myLogger.info(structSeitenNeu[aktuelleID].getWert());
+
myDocStruct.removeReferenceTo(structSeitenNeu[aktuelleID].getMd().getDocStruct());
}
StructSeitenErmitteln(myDocStruct);
@@ -2474,7 +2392,6 @@
while (iterator.hasNext()) {
String elem = ((String) iterator.next());
if (elem != null && elem.contains(pref) || "".equals(pref)) {
- // if ((elem != null && elem.toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref)) {
result.add(elem);
}
}
=== modified file 'src/de/sub/goobi/metadaten/MetadatenHelper.java'
--- src/de/sub/goobi/metadaten/MetadatenHelper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/metadaten/MetadatenHelper.java 2012-02-22 14:09:22 +0000
@@ -81,8 +81,7 @@
public DocStruct ChangeCurrentDocstructType(DocStruct inOldDocstruct, String inNewType) throws DocStructHasNoTypeException,
MetadataTypeNotAllowedException, TypeNotAllowedAsChildException, TypeNotAllowedForParentException {
- // inOldDocstruct.getType().getName()
- // + " soll werden zu " + inNewType);
+
DocStructType dst = myPrefs.getDocStrctTypeByName(inNewType);
DocStruct newDocstruct = mydocument.createDocStruct(dst);
@@ -203,7 +202,6 @@
}
/* anschliessend die Childliste korrigieren */
- // parent.addChild(myStrukturelement);
for (Iterator<DocStruct> iter = alleDS.iterator(); iter.hasNext();) {
parent.addChild(iter.next());
}
@@ -398,7 +396,7 @@
try {
if (mdt.getIsPerson()) {
Person p = new Person(mdt);
- // p.setType(mdt);
+
p.setRole(mdt.getName());
inStruct.addPerson(p);
} else {
@@ -601,14 +599,6 @@
return myList;
}
- // FilenameFilter filter = new FilenameFilter() {
- // public boolean accept(File dir, String name) {
- // String prefix = ConfigMain.getParameter("ImagePrefix", "\\d{8}");
- // String suffix = ConfigMain.getParameter("ImageSuffix", "\\.[Tt][Ii][Ff][Ff]?");
- // return name.matches(prefix + suffix);
- // }
- // };
-
public int compare(Object o1, Object o2) {
String imageSorting = ConfigMain.getParameter("ImageSorting", "number");
String s1 = (String) o1;
=== modified file 'src/de/sub/goobi/metadaten/MetadatenImagesHelper.java'
--- src/de/sub/goobi/metadaten/MetadatenImagesHelper.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/metadaten/MetadatenImagesHelper.java 2012-02-22 14:09:22 +0000
@@ -109,7 +109,7 @@
MetadataType MDTypeForPath = myPrefs.getMetadataTypeByName("pathimagefiles");
try {
Metadata mdForPath = new Metadata(MDTypeForPath);
- // mdForPath.setType(MDTypeForPath);
+
// TODO: add the possibilty for using other image formats
if (SystemUtils.IS_OS_WINDOWS) {
mdForPath.setValue("file:/" + inProzess.getImagesDirectory() + inProzess.getTitel().trim() + "_tif");
@@ -149,7 +149,7 @@
physicaldocstruct.addChild(dsPage);
MetadataType mdt = myPrefs.getMetadataTypeByName("physPageNumber");
Metadata mdTemp = new Metadata(mdt);
- // mdTemp.setType(mdt);
+
mdTemp.setValue(String.valueOf(i + 1));
dsPage.addMetadata(mdTemp);
@@ -159,12 +159,10 @@
*/
mdt = myPrefs.getMetadataTypeByName("logicalPageNumber");
mdTemp = new Metadata(mdt);
- // mdTemp.setType(mdt);
+
mdTemp.setValue(String.valueOf(i + 1));
dsPage.addMetadata(mdTemp);
- // myLogger.debug("fertig mit Paginierung für Nr. " + i +
- // " von " + myBildLetztes);
} catch (TypeNotAllowedAsChildException e) {
logger.error(e);
} catch (MetadataTypeNotAllowedException e) {
@@ -179,7 +177,7 @@
List<? extends Metadata> mdts = page.getAllMetadataByType(mdt);
if (mdts.size() != 1) {
throw new SwapException("found page DocStruct with more or less than 1 pysical pagination");
- // return myLastImage;
+
}
/*
* delete page DocStruct, if physical pagenumber higher than last imagenumber
@@ -272,7 +270,6 @@
return false;
}
- // ArrayList<String> images = getImageFiles(inProzess);
myLastImage = dateien.length;
if (ConfigMain.getParameter("ImagePrefix", "\\d{8}").equals("\\d{8}")) {
List<String> filesDirs = Arrays.asList(dateien);
@@ -341,7 +338,6 @@
File dir;
try {
dir = new File(myProzess.getImagesTifDirectory());
- // throw new NullPointerException("wer das liest ist doof");
} catch (Exception e) {
throw new InvalidImagesException(e);
}
@@ -377,7 +373,6 @@
File dir;
try {
dir = new File(myProzess.getImagesDirectory() + directory);
- // throw new NullPointerException("wer das liest ist doof");
} catch (Exception e) {
throw new InvalidImagesException(e);
}
=== modified file 'src/de/sub/goobi/metadaten/MetadatenSperrung.java'
--- src/de/sub/goobi/metadaten/MetadatenSperrung.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/metadaten/MetadatenSperrung.java 2012-02-22 14:09:22 +0000
@@ -145,10 +145,4 @@
.get("Lebenszeichen"))) / 1000;
}
-// /* =============================================================== */
-//
-// public static HashMap<Integer, HashMap<String, String>> getSperrungen() {
-// return sperrungen;
-// }
-
}
=== modified file 'src/de/sub/goobi/metadaten/MetadatenVerifizierung.java'
--- src/de/sub/goobi/metadaten/MetadatenVerifizierung.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/metadaten/MetadatenVerifizierung.java 2012-02-22 14:09:22 +0000
@@ -49,7 +49,7 @@
//TODO: Use generics
//TODO: Don't use Iterators
public class MetadatenVerifizierung {
-// Helper help = new Helper();
+
UghHelper ughhelp = new UghHelper();
List<DocStruct> docStructsOhneSeiten;
Prozess myProzess;
@@ -186,14 +186,6 @@
if (alleMetadaten != null && alleMetadaten.size() > 0) {
@SuppressWarnings("unused")
Metadata mmm = (Metadata) alleMetadaten.get(0);
- // TODO add a real check here, not this stupid shit...
- // wenn der Imagepfad noch auf C:\ steht, validierung false
- /*
- * if (!mmm.getValue().equals("C:\\")) return true; else {
- * help.setFehlerMeldung("[" + myProzess.getTitel() + "] " +
- * "Verifizierung nicht erfolgreich, Imagepfad steht auf C:\\",
- * ""); return false; }
- */
return true;
} else {
Helper.setFehlerMeldung("[" + myProzess.getTitel() + "] " + "Can not verify, image path is not set", "");
@@ -335,14 +327,6 @@
MetadataType emdete = ughhelp.getMetadataType(inPrefs, tok);
listOfFromMdts.add(emdete);
} catch (UghHelperException e) {
- /*
- * wenn die zusammenzustellenden Personen für
- * CreatorsAllOrigin als Metadatatyp nicht
- * existieren, Exception abfangen und nicht weiter
- * drauf eingehen
- */
- // inFehlerList.add("Metadatatype does not exist: "
- // + tok);
}
}
if (listOfFromMdts.size() > 0)
@@ -373,20 +357,14 @@
if (createMetadaten == null || createMetadaten.size() == 0) {
try {
Metadata createdElement = new Metadata(mdt);
- // createdElement.setType(mdt);
+
StringBuffer myValue = new StringBuffer();
/*
* alle anzufügenden Metadaten durchlaufen und an das Element
- * anh�ngen
+ * anhängen
*/
for (MetadataType mdttemp : inListOfFromMdts) {
- // TODO and done: Cast without exceptionhandling - rather
- // implement typesafe code
- // MetadataType mdttemp = (MetadataType) iter.next();
-
- // List fromElemente =
- // myStruct.getAllMetadataByType(mdttemp);
List<Person> fromElemente = myStruct.getAllPersons();
if (fromElemente != null && fromElemente.size() > 0) {
/*
@@ -395,10 +373,6 @@
*/
for (Person p : fromElemente) {
- // TODO: Cast without exceptionhandling - rather
- // implement typesafe code
- // Person p = (Person) iter2.next();
-
if (p.getRole() == null) {
Helper.setFehlerMeldung("[" + myProzess.getTitel() + " " + myStruct.getType() + "] Person without role");
break;
@@ -421,9 +395,9 @@
myStruct.addMetadata(createdElement);
}
} catch (DocStructHasNoTypeException e) {
- // e.printStackTrace();
+
} catch (MetadataTypeNotAllowedException e) {
- // e.printStackTrace();
+
}
}
=== modified file 'src/de/sub/goobi/modul/ExtendedDataImpl.java'
--- src/de/sub/goobi/modul/ExtendedDataImpl.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/modul/ExtendedDataImpl.java 2012-02-22 14:09:22 +0000
@@ -64,7 +64,7 @@
*/
public class ExtendedDataImpl extends DataImpl {
BeanHelper beanhelp = new BeanHelper();
-// Helper help = new Helper();
+
private String isProcess = "PROCESS";
private String isWorkpiece = "WORKPIECE";
private String isTemplate = "TEMPLATE";
@@ -313,4 +313,4 @@
return 0;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/modul/ExtendedProzessImpl.java'
--- src/de/sub/goobi/modul/ExtendedProzessImpl.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/modul/ExtendedProzessImpl.java 2012-02-22 14:09:22 +0000
@@ -44,7 +44,6 @@
* @author Igor Toker
*/
public class ExtendedProzessImpl extends ProcessImpl {
-// Helper help = new Helper();
/**
* Diese Methode wird benötigt um die mit der Session ID verbundene Prozess ID zu erhalten.
=== modified file 'src/de/sub/goobi/modul/ModulListener.java'
--- src/de/sub/goobi/modul/ModulListener.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/modul/ModulListener.java 2012-02-22 14:09:22 +0000
@@ -31,25 +31,16 @@
public class ModulListener implements ServletContextListener {
private static final Logger myLogger = Logger.getLogger(ModulListener.class);
-
-
-
public void contextInitialized(ServletContextEvent event) {
myLogger.debug("Starte Modularisierung-Server", null);
-// modules = new ExtendedGoobiModuleManager(8000);
-// modules
-// .add(new ModuleDesc("Hotburn Module", "http://localhost:8095";, null, "unser Hotburn Testmodule"));
new ModuleServerForm().startAllModules();
myLogger.debug("Gestartet: Modularisierung-Server", null);
}
-
-
public void contextDestroyed(ServletContextEvent event) {
myLogger.debug("Stoppe Modularisierung-Server", null);
-// modules.shutdown();
new ModuleServerForm().stopAllModules();
myLogger.debug("Gestoppt: Modularisierung-Server", null);
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java'
--- src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java 2012-02-22 14:09:22 +0000
@@ -68,7 +68,6 @@
currentSession = sf.openSession();
currentSession.setFlushMode(FlushMode.MANUAL);
} else {
- // log.debug("< Continuing conversation");
currentSession = (org.hibernate.classic.Session) disconnectedSession;
}
@@ -77,8 +76,6 @@
}
try {
- // log.debug("Starting a database transaction");
- // log.debug("Binding the current Session");
ManagedSessionContext.bind(currentSession);
} catch (Exception e) {
throw new ServletException(new GUIExceptionWrapper(Helper.getTranslation("err_noConnectionEstablished") + " ManagedSessionContext", e));
@@ -108,10 +105,9 @@
// cleanup after unhandled exception in program flow
} catch (Exception e) {
- // log.debug("Storing Session in the HttpSession");
+
try {
currentSession = ManagedSessionContext.unbind(sf);
- // currentSession.flush();
currentSession.getTransaction().commit();
} catch (Exception e2) {
@@ -131,7 +127,6 @@
try {
currentSession = ManagedSessionContext.unbind(sf);
- // currentSession.flush();
// for the purpose of rollback we catch exception here and notify
// gui of error
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java'
--- src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java 2012-02-22 14:09:22 +0000
@@ -67,7 +67,6 @@
currentSession = sf.openSession();
currentSession.setFlushMode(FlushMode.MANUAL);
} else {
- // log.debug("< Continuing conversation");
currentSession = (org.hibernate.classic.Session) disconnectedSession;
}
@@ -76,23 +75,11 @@
}
try {
- // log.debug("Starting a database transaction");
- // log.debug("Binding the current Session");
ManagedSessionContext.bind(currentSession);
} catch (Exception e) {
throw new ServletException(new GUIExceptionWrapper(Helper.getTranslation("err_noConnectionEstablished") + " ManagedSessionContext", e));
}
- /* ############################ UNCOMMENTED TRANSACTIONS IN FILTER - START ###################################
- try {
- currentSession.beginTransaction();
- } catch (HibernateException e) {
- log.error("no database connection available", e);
- ManagedSessionContext.unbind(sf);
- throw new ServletException(new GUIExceptionWrapper(Helper.getTranslation("err_noConnectionEstablished") + " BeginTransaction", e));
- }
- ############################ UNCOMMENTED TRANSACTIONS IN FILTER - END ################################### */
-
// #################################
// #################################
// #################################
@@ -109,14 +96,9 @@
// cleanup after unhandled exception in program flow
} catch (Exception e) {
- // log.debug("Storing Session in the HttpSession");
+
try {
currentSession = ManagedSessionContext.unbind(sf);
- // currentSession.flush();
-
- /* ############################ UNCOMMENTED TRANSACTIONS IN FILTER - START ###################################
- currentSession.getTransaction().commit();
- ############################ UNCOMMENTED TRANSACTIONS IN FILTER - END ################################### */
} catch (Exception e2) {
e.setStackTrace(e2.getStackTrace());
@@ -135,30 +117,6 @@
try {
currentSession = ManagedSessionContext.unbind(sf);
- // currentSession.flush();
-
- // for the purpose of rollback we catch exception here and notify gui of error
- /* ############################## UNCOMMENTED TRANSACTIONS IN FILTER - START ################
- try {
- currentSession.getTransaction().commit();
- } catch (Exception e) {
- try {
- log.error("error while commiting", e);
- if (currentSession.getTransaction().isActive()) {
- currentSession.getTransaction().rollback();
- currentSession.close();
- throw new ServletException(new GUIExceptionWrapper("Unexpected Error while trying to commit and rollback active transaction."
- + "Data is probably not saved", e));
- }
- } catch (Throwable thrbl) {
- if (currentSession != null) {
- currentSession.close();
- }
- throw new ServletException(new GUIExceptionWrapper("Unexpected Error while trying to commit inactive transaction."
- + "Data is probably not saved", e));
- }
- }
- ############################## UNCOMMENTED TRANSACTIONS IN FILTER - END ################ */
// now we update the hibernate session in the http session
// or delete it in there
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionLong.java'
--- src/de/sub/goobi/persistence/HibernateSessionLong.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionLong.java 2012-02-22 14:09:22 +0000
@@ -35,7 +35,6 @@
public class HibernateSessionLong {
private static final Logger mylogger = Logger.getLogger(HibernateSessionLong.class);
- // protected static ThreadLocal hibernateHolder = new ThreadLocal();
protected static SessionFactory factory;
private Session sess;
=== modified file 'src/de/sub/goobi/persistence/HibernateUtilOld.java'
--- src/de/sub/goobi/persistence/HibernateUtilOld.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/HibernateUtilOld.java 2012-02-22 14:09:22 +0000
@@ -61,8 +61,6 @@
try {
configuration = new Configuration();
sessionFactory = configuration.configure().buildSessionFactory();
- // We could also let Hibernate bind it to JNDI:
- // configuration.configure().buildSessionFactory()
} catch (Throwable ex) {
// We have to catch Throwable, otherwise we will miss
// NoClassDefFoundError and other subclasses of Error
@@ -77,17 +75,6 @@
* @return SessionFactory
*/
public static SessionFactory getSessionFactory() {
- /* Instead of a static variable, use JNDI:
- SessionFactory sessions = null;
- try {
- Context ctx = new InitialContext();
- String jndiName = "java:hibernate/HibernateFactory";
- sessions = (SessionFactory)ctx.lookup(jndiName);
- } catch (NamingException ex) {
- throw new InfrastructureException(ex);
- }
- return sessions;
- */
return sessionFactory;
}
@@ -144,7 +131,7 @@
Session s = (Session) threadSession.get();
try {
if (s == null) {
-// log.debug("Opening new Session for this thread.");
+
if (getInterceptor() != null) {
log.debug("Using interceptor: " + getInterceptor().getClass());
s = getSessionFactory().openSession(getInterceptor());
@@ -168,7 +155,7 @@
Session s = (Session) threadSession.get();
threadSession.set(null);
if (s != null && s.isOpen()) {
-// log.debug("Closing Session of this thread.");
+
s.close();
}
} catch (HibernateException ex) {
@@ -283,4 +270,4 @@
return interceptor;
}
-}
\ No newline at end of file
+}
=== modified file 'src/de/sub/goobi/persistence/ProjektDAO.java'
--- src/de/sub/goobi/persistence/ProjektDAO.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/ProjektDAO.java 2012-02-22 14:09:22 +0000
@@ -36,9 +36,6 @@
public Projekt save(Projekt t) throws DAOException {
storeObj(t);
-// for (Prozess p : t.getProzesse()) {
-// LuceneIndex.updateProcess(p);
-// }
return (Projekt) retrieveObj(Projekt.class, t.getId());
}
@@ -51,19 +48,12 @@
public void remove(Projekt t) throws DAOException {
if (t.getId() != null) {
-// for (Prozess p : t.getProzesse()) {
-// LuceneIndex.deleteProcess(p);
-// }
removeObj(t);
}
}
public void remove(Integer id) throws DAOException {
if (id != null) {
-// Projekt t = (Projekt) retrieveObj(Projekt.class, id);
-// for (Prozess p : t.getProzesse()) {
-// LuceneIndex.deleteProcess(p);
-// }
removeObj(Projekt.class, id);
}
}
=== modified file 'src/de/sub/goobi/statistik/StatistikStatus.java'
--- src/de/sub/goobi/statistik/StatistikStatus.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/statistik/StatistikStatus.java 2012-02-22 14:09:22 +0000
@@ -42,7 +42,6 @@
/* prüfen, ob der Schritt schon erfasst wurde, wenn ja hochzählen */
String kurztitel = (step.getTitel().length() > 60 ? step.getTitel().substring(0, 60) + "..." : step
.getTitel());
- // if (kurztitel.length()>60) kurztitel = kurztitel.substring(0,60) + "...";
if (dataset.getIndex(kurztitel) != -1)
dataset.setValue(kurztitel, dataset.getValue(kurztitel).intValue() + 1);
else
=== removed file 'src/de/sub/goobi/statistik/TODO'
--- src/de/sub/goobi/statistik/TODO 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/statistik/TODO 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-TODO:
-- Move thes classes to the new statistics functionality (org.goobi.production.flow.statistics)
\ No newline at end of file
=== modified file 'src/de/unigoettingen/sub/search/opac/Catalogue.java'
--- src/de/unigoettingen/sub/search/opac/Catalogue.java 2011-12-20 08:07:09 +0000
+++ src/de/unigoettingen/sub/search/opac/Catalogue.java 2012-02-22 14:09:22 +0000
@@ -44,7 +44,6 @@
//dir of local iktLists
private static final String DIR = "";
-// "/home/jens/Desktop/workspace/Search/WEB-INF/src/de/unigoettingen/sub/search/opac/";
/** The url path part of the search item list on the server*/
private static final String IKTLIST = "/XML=1.0/IKTLIST";
@@ -193,7 +192,7 @@
String requestUrl = "http://"+ serverAddress + ":" + port + "/" +
dataBase + IKTLIST;
if (verbose){
-// System.err.println("Loading the IKTLIST failed, requesting it from opac");
+
System.out.println("Retrieving IKTLIST for opac " +
this.description + ": " + requestUrl);
}
=== modified file 'src/de/unigoettingen/sub/search/opac/GetOpac.java'
--- src/de/unigoettingen/sub/search/opac/GetOpac.java 2011-12-20 08:07:09 +0000
+++ src/de/unigoettingen/sub/search/opac/GetOpac.java 2012-02-22 14:09:22 +0000
@@ -81,12 +81,6 @@
private static final String PICA_SUBFIELD_NAME = "code";
- // public static final String PICA_SUBFIELD_NAME = "subfield";
- // public static final String PICA_SUBFIELD = "value";
- // public static final String PICA_FIELD = "picaplus";
- // public static final String PICA_FIELD_NAME = "field";
- // public static final String PICA_RECORD = "picaplusrecord";
-
// the opac url parts
private static final String SET_ID_URL = "/SET=";
@@ -132,9 +126,6 @@
// shortlist so that caching is in principal only used for sessionid and
// searchopac. is it reasonable?
private String lastQuery = "";
- // private String sessionID = "";
- // //set id can differ although session id stays the same
- // private String setID = "";
private OpacResponseHandler lastOpacResult = null;
@@ -342,24 +333,9 @@
xmlResult.append(xmlFormatPica(retrievePicaTitle(i)));
- // if (xmlPicaPlusLong != null){
- // xmlResult.append(xmlPicaPlusLong);
- // }else{
- // System.err.println("Could not retrieve data for hit nr:" + i);
- // }
}
xmlResult.append(" </" + PICA_COLLECTION_RECORDS + ">\n");
- // //check if we got an result
- // if (((Element)result).hasAttribute("error")){
- // //if it was not an error because of no hits getNumberOfHits
- // //throws an exception
- // if (getNumberOfHits(query) == 0){
- // throw new Exception("No Hits");
- // }
- //
- // }
-
return xmlResult.toString();
}
@@ -538,54 +514,6 @@
return opacResult;
}
- // INTERNAL (Internal - implementation details, local classes, ...)
-
- // private String xmlFormatPica(String picaXmlRecord) {
- // System.out.println(picaXmlRecord);
- // StringBuffer result = new StringBuffer(" <" + PICA_RECORD + ">\n");
- // int startField = 0;
- // int nextField = 0;
- // int endField = picaXmlRecord.indexOf("</LONGTITLE>");
- // String field = null;
- // String[] fieldComponents = null;
- // String fieldName = null;
- // String fieldOccurence = null;
- // int indexOfFieldOccurence = -1;
- //
- // while (nextField != endField) {
- // startField = picaXmlRecord.indexOf("<br />", startField) + 6;
- // nextField = picaXmlRecord.indexOf("<br />", startField);
- // if (nextField == -1) {
- // nextField = endField;
- // }
- // field = picaXmlRecord.substring(startField, nextField).trim();
- // fieldComponents = field.split("\\$");
- // indexOfFieldOccurence = fieldComponents[0].indexOf("/");
- //
- // if (indexOfFieldOccurence != -1) {
- // fieldName = fieldComponents[0].substring(0, indexOfFieldOccurence);
- // fieldOccurence = fieldComponents[0].substring(indexOfFieldOccurence + 1);
- // result.append(" <" + PICA_FIELD + " " + PICA_FIELD_NAME + "=\"" + fieldName + "\" "
- // + PICA_FIELD_OCCURENCES + "=\"" + fieldOccurence + "\">\n");
- // } else {
- // result
- // .append(" <" + PICA_FIELD + " " + PICA_FIELD_NAME + "=\"" + fieldComponents[0] + "\">\n");
- // }
- //
- // for (int i = 1; i < fieldComponents.length; i++) {
- // result.append(" <" + PICA_SUBFIELD + " " + PICA_SUBFIELD_NAME + "=\""
- // + fieldComponents[i].charAt(0) + "\">" + fieldComponents[i].substring(1) + "</"
- // + PICA_SUBFIELD + ">\n");
- // }
- //
- // result.append(" </" + PICA_FIELD + ">\n");
- // }
- //
- // result.append(" </" + PICA_RECORD + ">\n");
- // System.out.println("--------------------------------\n\n"+ result.toString());
- // return result.toString();
- // }
-
private String xmlFormatPica(String picaXmlRecord) {
StringBuffer result = new StringBuffer(" <" + PICA_RECORD + ">\n");
try {
@@ -715,9 +643,8 @@
**********************************************************************/
private String retrieveDataFromOPAC(String url) throws IOException {
- // if (verbose){
System.out.println("Retrieving URL: http://"; + cat.getServerAddress() + ":" + cat.getPort() + url + cat.getCbs());
- // }
+
GetMethod opacRequest = new GetMethod("http://"; + cat.getServerAddress() + ":" + cat.getPort() + url + cat.getCbs());
try {
=== modified file 'src/de/unigoettingen/sub/search/opac/Query.java'
--- src/de/unigoettingen/sub/search/opac/Query.java 2011-12-20 08:07:09 +0000
+++ src/de/unigoettingen/sub/search/opac/Query.java 2012-02-22 14:09:22 +0000
@@ -32,9 +32,7 @@
public static final String AND = "*";
public static final String OR = "%2B"; //URL-encoded +
public static final String NOT = "-";
-// public static final String AND = "AND";
-// public static final String OR = "OR";
-// public static final String NOT = "-";
+
private static final String FIRST_OPERATOR = "SRCH";
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2012-02-22 14:09:22 +0000
@@ -100,11 +100,6 @@
// Name
String name = element.getAttributeValue(NAME);
property.setName(name);
- // Position
- // if (element.getAttribute(POSITION) != null) {
- // property.setPosition(Integer.valueOf(element
- // .getAttributeValue(POSITION)));
- // }
// Required
if (element.getAttribute(REQUIRED) != null) {
property.setRequired(Boolean.valueOf(element.getAttributeValue(REQUIRED)));
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2012-02-22 14:09:22 +0000
@@ -65,8 +65,6 @@
private IGoobiEntity owningEntity;
private boolean isUsed = false;
- // private Integer container;
-
public PropertyTemplate(IGoobiEntity inEntity) {
this.owningEntity = inEntity;
}
@@ -105,12 +103,8 @@
*/
private void initPropery() {
if (this.maskedProp == null) {
-// if (owningEntity != null) {
- this.maskedProp = generateProperty(owningEntity, name);
- maskedProp.setWert(selectedValue);
- // } else {
- // logger.error("scheiße");
-// }
+ this.maskedProp = generateProperty(owningEntity, name);
+ maskedProp.setWert(selectedValue);
}
}
@@ -306,14 +300,8 @@
*/
private void addProperty(IGoobiProperty inProp) {
this.maskedProp = inProp;
- // this.value = inProp.getWert();
+
this.selectedValue = inProp.getWert();
- // this.setType(inProp.getType());
- // this.required = inProp.isIstObligatorisch();
- // if (this.getType() == null) {
- // this.setType(PropertyType.SpecialView);
- // }
-
}
/*
@@ -333,7 +321,7 @@
// setting the value should be done before setting myProp
// because setter triggers a synchronization
addProperty(hgp);
- // logger.debug("name: " + hgp.getName() + " value: " + hgp.getValue() + " type: " + hgp.getType());
+
return true;
}
return false;
@@ -585,7 +573,7 @@
*/
public void setContainer(int container) {
initPropery();
- // this.container = container;
+
maskedProp.setContainer(container);
}
@@ -594,9 +582,6 @@
*/
public int getContainer() {
initPropery();
- // if (container == null) {
- // return 0;
- // }
return maskedProp.getContainer();
}
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2012-02-22 14:09:22 +0000
@@ -62,10 +62,7 @@
* @throws JDOMException
***************************************************************************/
public static XMLBasedPropertyTemplateProvider getInstance(IGoobiEntity inEntity) throws JDOMException, IOException {
-// if (instance == null) {
-
- instance = new XMLBasedPropertyTemplateProvider(inEntity);
-// }
+ instance = new XMLBasedPropertyTemplateProvider(inEntity);
return instance;
}
@@ -94,7 +91,7 @@
List<PropertyTemplate> tempList = filterPropertyList(status);
List<PropertyTemplate> returnList = new ArrayList<PropertyTemplate>();
for (PropertyTemplate pt : tempList) {
-// pt.setOwningEntity(inEntity);
+
PropertyTemplate bla = new PropertyTemplate(inEntity, pt.getName());
bla.setAuswahl(pt.getAuswahl());
bla.setCreationDate(pt.getCreationDate());
@@ -113,9 +110,6 @@
sortPropertyList();
- // ArrayList<IPropertyTemplate> returnList = new ArrayList<IPropertyTemplate>();
- //
- // returnList.addAll(tempList);
return returnList;
}
=== modified file 'src/org/goobi/production/chart/HibernateProjectTaskList.java'
--- src/org/goobi/production/chart/HibernateProjectTaskList.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/chart/HibernateProjectTaskList.java 2012-02-22 14:09:22 +0000
@@ -60,7 +60,6 @@
count++;
Schritt step = (Schritt) list.get(0);
String shorttitle = (step.getTitel().length() > 60 ? step.getTitel().substring(0, 60) + "..." : step.getTitel());
- // shorttitle += " (" + step.getReihenfolge() + ")";
IProjectTask pt = null;
for (IProjectTask task : myTaskList) {
@@ -88,12 +87,6 @@
pt.setStepsMax(pt.getStepsMax() + 1);
}
- /*if (count % 20 == 0) {
- //flush a batch of updates and release memory:
- session.flush();
- session.clear();
- }*/
-
}
}
=== modified file 'src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java'
--- src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2012-02-22 14:09:22 +0000
@@ -76,7 +76,6 @@
proList.add(Projections.property("bearbeitungsstatus"));
proList.add(Projections.sum("proc.sortHelperImages"));
proList.add(Projections.count("id"));
-// proList.add(Projections.groupProperty(("reihenfolge")));
proList.add(Projections.groupProperty(("titel")));
proList.add(Projections.groupProperty(("bearbeitungsstatus")));
=== modified file 'src/org/goobi/production/cli/CommandLineInterface.java'
--- src/org/goobi/production/cli/CommandLineInterface.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/cli/CommandLineInterface.java 2012-02-22 14:09:22 +0000
@@ -271,7 +271,6 @@
File image = new File(images,file);
File dest = new File(p.getImagesOrigDirectory() + image.getName());
Helper.copyFile(image, dest);
-// image.renameTo(dest);
}
}
}
=== modified file 'src/org/goobi/production/cli/helper/CopyProcess.java'
--- src/org/goobi/production/cli/helper/CopyProcess.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/cli/helper/CopyProcess.java 2012-02-22 14:09:22 +0000
@@ -240,46 +240,6 @@
/* =============================================================== */
- // public List<SelectItem> getProzessTemplates() throws DAOException {
- // List<SelectItem> myProzessTemplates = new ArrayList<SelectItem>();
- // // HibernateUtil.clearSession();
- // Session session = Helper.getHibernateSession();
- // Criteria crit = session.createCriteria(Prozess.class);
- // crit.add(Expression.eq("istTemplate", Boolean.valueOf(false)));
- // crit.add(Expression.eq("inAuswahllisteAnzeigen", Boolean.valueOf(true)));
- // crit.addOrder(Order.asc("titel"));
- //
- // /* Einschränkung auf bestimmte Projekte, wenn kein Admin */
- // LoginForm loginForm = (LoginForm) Helper.getManagedBeanValue("#{LoginForm}");
- // Benutzer aktuellerNutzer = loginForm.getMyBenutzer();
- // try {
- // aktuellerNutzer = new BenutzerDAO().get(loginForm.getMyBenutzer().getId());
- // } catch (DAOException e) {
- // e.printStackTrace();
- // }
- // if (aktuellerNutzer != null) {
- // /*
- // * wenn die maximale Berechtigung nicht Admin ist, dann nur
- // * bestimmte
- // */
- // if (loginForm.getMaximaleBerechtigung() > 1) {
- // Hibernate.initialize(aktuellerNutzer);
- // Disjunction dis = Expression.disjunction();
- // for (Projekt proj : aktuellerNutzer.getProjekteList()) {
- // dis.add(Expression.eq("projekt", proj));
- // }
- // crit.add(dis);
- // }
- // }
- //
- // for (Object proz : crit.list()) {
- // myProzessTemplates.add(new SelectItem(((Prozess) proz).getId(), ((Prozess) proz).getTitel(), null));
- // }
- // return myProzessTemplates;
- // }
-
- /* =============================================================== */
-
/**
* OpacAnfrage
*/
@@ -291,30 +251,9 @@
/* den Opac abfragen und ein RDF draus bauen lassen */
myRdf = new MetsMods(myPrefs);
myRdf.read(metadataFile);
- // System.out.println(metadataFile);
- // System.out.println(myRdf.read(metadataFile));
- // System.out.println(myRdf.getDigitalDocument());
- //
- // if (myImportOpac.getOpacDocType() != null)
- // docType = myImportOpac.getOpacDocType().getTitle();
-
- // if (myImportOpac.isMonograph())
- // docType = "monograph";
- // if (myImportOpac.isContainedWork())
- // docType = "containedwork";
- // if (myImportOpac.isPeriodical())
- // docType = "periodical";
- // if (myImportOpac.isMultivolume())
- // docType = "multivolume";
-
- // atstsl = myImportOpac.getAtstsl();
+
fillFieldsFromMetadataFile(myRdf);
- /* über die Treffer informieren */
- // if (myImportOpac.getHitcount() == 0)
- // help.setFehlerMeldung("keine Treffer gefunden", "");
- // if (myImportOpac.getHitcount() > 1)
- // help.setMeldung(null, "mehrere Treffer gefunden", " - Daten des ersten Treffers übernommen");
} catch (Exception e) {
Helper.setFehlerMeldung("Fehler beim Einlesen des Opac-Ergebnisses ", e);
e.printStackTrace();
@@ -470,7 +409,6 @@
Helper.setFehlerMeldung("UnvollstaendigeDaten: ", "kein Vorgangstitel angegeben");
}
- // if (!prozessKopie.getTitel().matches("[\\w-]*")) {
String validateRegEx = ConfigMain.getParameter("validateProzessTitelRegex", "[\\w-]*");
if (!prozessKopie.getTitel().matches(validateRegEx)) {
valide = false;
@@ -548,18 +486,6 @@
* -------------------------------- jetzt in der Prozesskopie für alle bereits abgeschlossenen Schritte ein Bearbeitungsdatum und einen
* Benutzer eintragen --------------------------------
*/
- // for (Iterator iter = prozessKopie.getSchritteList().iterator();
- // iter.hasNext();) {
- // Schritt step = (Schritt) iter.next();
- // if (step.getBearbeitungsstatus().intValue() == 3) {
- // step.setBearbeitungsbeginn(new Date());
- // step.setBearbeitungszeitpunkt(new Date());
- // step.setBearbeitungsende(new Date());
- // LoginForm loginForm = (LoginForm)
- // Helper.getManagedBeanValue("#{LoginForm}");
- // step.setBearbeitungsbenutzer(loginForm.getMyBenutzer());
- // }
- // }
for (Schritt step : prozessKopie.getSchritteList()) {
/*
* -------------------------------- always save date and user for each step --------------------------------
@@ -598,7 +524,6 @@
/*
* wenn noch keine RDF-Datei vorhanden ist (weil keine Opac-Abfrage stattfand, dann jetzt eine anlegen
*/
- // if (myRdf == null)
createNewFileformat();
// /*--------------------------------
@@ -653,11 +578,6 @@
*/
if (myTempChild != null) {
md = ughHelp.getMetadata(myTempChild, mdt);
- // if (md.getType() == null) {
- // md = new Metadata(mdt);
- // md.setDocStruct(myTempChild);
- // myTempChild.addMetadata(md);
- // }
md.setValue(field.getWert());
}
}
@@ -945,8 +865,6 @@
List projektnamen = projekt.getChildren("name");
for (Iterator iterator = projektnamen.iterator(); iterator.hasNext();) {
Element projektname = (Element) iterator.next();
- // System.out.println(projektname.getText() +
- // " - soll sein: " + prozessKopie.getProjekt().getTitel());
/*
* wenn der Projektname aufgeführt wird, dann alle Digitalen Collectionen in die Liste
@@ -955,7 +873,6 @@
List myCols = projekt.getChildren("DigitalCollection");
for (Iterator it2 = myCols.iterator(); it2.hasNext();) {
Element col = (Element) it2.next();
- // System.out.println(col.getText());
possibleDigitalCollection.add(col.getText());
}
}
@@ -1128,7 +1045,7 @@
/* jetzt den Bandtitel parsen */
while (tokenizer.hasMoreTokens()) {
String myString = tokenizer.nextToken();
- // System.out.println(myString);
+
/*
* wenn der String mit ' anfängt und mit ' endet, dann den Inhalt so übernehmen
*/
@@ -1195,16 +1112,7 @@
Helper.setFehlerMeldung("IOException", e.getMessage());
return;
}
- // if (docType.equals("monograph"))
- // tif_definition = cp.getParamString("tifheader.monograph");
- // if (docType.equals("containedwork"))
- // tif_definition = cp.getParamString("tifheader.containedwork");
- // if (docType.equals("multivolume"))
- // tif_definition = cp.getParamString("tifheader.multivolume");
- // if (docType.equals("periodical"))
- // tif_definition = cp.getParamString("tifheader.periodical");
- // if (docType.equals("volume"))
- // tif_definition = cp.getParamString("tifheader.volume");
+
tif_definition = cp.getParamString("tifheader." + docType, "blabla");
/*
@@ -1216,35 +1124,25 @@
/*
* -------------------------------- Documentname ist im allgemeinen = Prozesstitel --------------------------------
*/
- // if (tifHeader_documentname.equals(""))
+
tifHeader_documentname = prozessKopie.getTitel();
tifHeader_imagedescription = "";
+
/*
* -------------------------------- Imagedescription --------------------------------
*/
- // if (tifHeader_imagedescription.equals("")) {
StringTokenizer tokenizer = new StringTokenizer(tif_definition, "+");
+
/* jetzt den Tiffheader parsen */
while (tokenizer.hasMoreTokens()) {
String myString = tokenizer.nextToken();
- // System.out.println(myString);
+
/*
* wenn der String mit ' anf�ngt und mit ' endet, dann den Inhalt so übernehmen
*/
if (myString.startsWith("'") && myString.endsWith("'") && myString.length() > 2)
tifHeader_imagedescription += myString.substring(1, myString.length() - 1);
else if (myString.equals("$Doctype")) {
- /* wenn der Doctype angegeben werden soll */
- // if (docType.equals("monograph"))
- // tifHeader_imagedescription += "Monographie";
- // if (docType.equals("volume"))
- // tifHeader_imagedescription += "Volume";
- // if (docType.equals("containedwork"))
- // tifHeader_imagedescription += "ContainedWork";
- // if (docType.equals("multivolume"))
- // tifHeader_imagedescription += "Band_MultivolumeWork";
- // if (docType.equals("periodical"))
- // tifHeader_imagedescription += "Band_Zeitschrift";
tifHeader_imagedescription += co.getDoctypeByName(docType).getTifHeaderType();
} else {
/* andernfalls den string als Feldnamen auswerten */
@@ -1264,7 +1162,6 @@
tifHeader_imagedescription += CalcProzesstitelCheck(myField.getTitel(), myField.getWert());
}
}
- // }
}
}
}
=== modified file 'src/org/goobi/production/export/ExportXmlLog.java'
--- src/org/goobi/production/export/ExportXmlLog.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/export/ExportXmlLog.java 2012-02-22 14:09:22 +0000
@@ -156,15 +156,12 @@
} else {
property.setAttribute("value", "");
}
- // HashMap<Locale, String> labelMap = (HashMap<Locale, String>) prop.getLabelAsHashMap();
- // Set<Locale> lang = labelMap.keySet();
- // for (Locale l : lang) {
+
Element label = new Element("label", xmlns);
- // label.setAttribute("lang", l.getLanguage(),Namespace.XML_NAMESPACE);
- // label.setText(labelMap.get(l));
+
label.setText(prop.getTitel());
property.addContent(label);
- // }
+
processProperties.add(property);
}
if (processProperties.size() != 0) {
@@ -216,15 +213,11 @@
} else {
property.setAttribute("value", "");
}
- // HashMap<Locale, String> labelMap = (HashMap<Locale, String>) prop.getLabelAsHashMap();
- // Set<Locale> lang = labelMap.keySet();
- // for (Locale l : lang) {
+
Element label = new Element("label", xmlns);
- // label.setAttribute("lang", l.getLanguage(),Namespace.XML_NAMESPACE);
- // label.setText(labelMap.get(l));
label.setText(prop.getTitel());
property.addContent(label);
- // }
+
stepProperties.add(property);
}
if (stepProperties.size() != 0) {
@@ -256,15 +249,11 @@
} else {
property.setAttribute("value", "");
}
- // HashMap<Locale, String> labelMap = (HashMap<Locale, String>) prop.getLabelAsHashMap();
- // Set<Locale> lang = labelMap.keySet();
- // for (Locale l : lang) {
+
Element label = new Element("label", xmlns);
- // label.setAttribute("lang", l.getLanguage(),Namespace.XML_NAMESPACE);
- // label.setText(labelMap.get(l));
+
label.setText(prop.getTitel());
property.addContent(label);
- // }
templateProperties.add(property);
if (prop.getTitel().equals("Signatur")) {
@@ -307,15 +296,12 @@
} else {
property.setAttribute("value", "");
}
- // HashMap<Locale, String> labelMap = (HashMap<Locale, String>) prop.getLabelAsHashMap();
- // Set<Locale> lang = labelMap.keySet();
- // for (Locale l : lang) {
+
Element label = new Element("label", xmlns);
- // label.setAttribute("lang", l.getLanguage(),Namespace.XML_NAMESPACE);
- // label.setText(labelMap.get(l));
+
label.setText(prop.getTitel());
property.addContent(label);
- // }
+
docProperties.add(property);
}
if (docProperties.size() != 0) {
=== modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java'
--- src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2012-02-22 14:09:22 +0000
@@ -234,20 +234,12 @@
case OPEN:
- // fix set start date - decision is that reopened (and therfore with timestamp for begin) shouldn't be reset
- /* if (step.getBearbeitungsbeginn() != null) {
- step.setBearbeitungsbeginn(null);
- isDirty = true;
- }
- */
-
// fix missing editing date
if (step.getBearbeitungszeitpunkt() == null) {
isDirty = true;
if (step.getBearbeitungsende() != null) {
step.setBearbeitungszeitpunkt(step.getBearbeitungsende());
} else {
- //step.setBearbeitungsbeginn(getTimestampFromPreviousStep(inProcess, step));
step.setBearbeitungszeitpunkt(getTimestampFromPreviousStep(inProcess, step));
}
}
@@ -429,26 +421,14 @@
}
}
- // commit transaction every 50 items
if (!it.hasNext() || i % 50 == 0) {
session.flush();
session.connection().commit();
session.clear();
}
- // } catch (IOException e) {
- // logger.error("IOException occured while scheduled storage calculation",
- // e);
- // } catch (InterruptedException e) {
- // logger.error("InterruptedException occured while scheduled storage calculation",
- // e);
- // } catch (SwapException e) {
- // logger.error("SwapException occured while scheduled storage calculation",
- // e);
+
} catch (HibernateException e) {
logger.error("HibernateException occured while scheduled storage calculation", e);
- // } catch (SQLException e) {
- // logger.error("SQLException occured while scheduled storage calculation",
- // e);
} catch (Exception e) {
Helper.setFehlerMeldung("An error occured while scheduled storage calculation", e);
logger.error("ServletException occured while scheduled storage calculation", e);
@@ -458,7 +438,7 @@
Helper.setFehlerMeldung("Another Exception occured while scheduled storage calculation", e);
logger.error("Another Exception occured while scheduled storage calculation", e);
}
- // session.close();
+
logger.info("end history updating for all processes");
}
=== modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java'
--- src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2012-02-22 14:09:22 +0000
@@ -234,20 +234,12 @@
case OPEN:
- // fix set start date - decision is that reopened (and therfore with timestamp for begin) shouldn't be reset
- /* if (step.getBearbeitungsbeginn() != null) {
- step.setBearbeitungsbeginn(null);
- isDirty = true;
- }
- */
-
// fix missing editing date
if (step.getBearbeitungszeitpunkt() == null) {
isDirty = true;
if (step.getBearbeitungsende() != null) {
step.setBearbeitungszeitpunkt(step.getBearbeitungsende());
} else {
- //step.setBearbeitungsbeginn(getTimestampFromPreviousStep(inProcess, step));
step.setBearbeitungszeitpunkt(getTimestampFromPreviousStep(inProcess, step));
}
}
@@ -434,20 +426,9 @@
session.connection().commit();
session.clear();
}
- // } catch (IOException e) {
- // logger.error("IOException occured while scheduled storage calculation",
- // e);
- // } catch (InterruptedException e) {
- // logger.error("InterruptedException occured while scheduled storage calculation",
- // e);
- // } catch (SwapException e) {
- // logger.error("SwapException occured while scheduled storage calculation",
- // e);
+
} catch (HibernateException e) {
logger.error("HibernateException occured while scheduled storage calculation", e);
- // } catch (SQLException e) {
- // logger.error("SQLException occured while scheduled storage calculation",
- // e);
} catch (Exception e) {
Helper.setFehlerMeldung("An error occured while scheduled storage calculation", e);
logger.error("ServletException occured while scheduled storage calculation", e);
@@ -457,7 +438,7 @@
Helper.setFehlerMeldung("Another Exception occured while scheduled storage calculation", e);
logger.error("Another Exception occured while scheduled storage calculation", e);
}
- // session.close();
+
logger.info("end history updating for all processes");
}
=== modified file 'src/org/goobi/production/flow/jobs/HistoryJob.java'
--- src/org/goobi/production/flow/jobs/HistoryJob.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/jobs/HistoryJob.java 2012-02-22 14:09:22 +0000
@@ -245,20 +245,12 @@
case OPEN:
- // fix set start date - decision is that reopened (and therfore with timestamp for begin) shouldn't be reset
- /* if (step.getBearbeitungsbeginn() != null) {
- step.setBearbeitungsbeginn(null);
- isDirty = true;
- }
- */
-
// fix missing editing date
if (step.getBearbeitungszeitpunkt() == null) {
isDirty = true;
if (step.getBearbeitungsende() != null) {
step.setBearbeitungszeitpunkt(step.getBearbeitungsende());
} else {
- //step.setBearbeitungsbeginn(getTimestampFromPreviousStep(inProcess, step));
step.setBearbeitungszeitpunkt(getTimestampFromPreviousStep(inProcess, step));
}
}
@@ -434,20 +426,9 @@
session.connection().commit();
session.clear();
}
- // } catch (IOException e) {
- // logger.error("IOException occured while scheduled storage calculation",
- // e);
- // } catch (InterruptedException e) {
- // logger.error("InterruptedException occured while scheduled storage calculation",
- // e);
- // } catch (SwapException e) {
- // logger.error("SwapException occured while scheduled storage calculation",
- // e);
+
} catch (HibernateException e) {
logger.error("HibernateException occured while scheduled storage calculation", e);
- // } catch (SQLException e) {
- // logger.error("SQLException occured while scheduled storage calculation",
- // e);
} catch (Exception e) {
new Helper().setFehlerMeldung("An error occured while scheduled storage calculation", e);
logger.error("ServletException occured while scheduled storage calculation", e);
@@ -458,7 +439,7 @@
logger.error("Another Exception occured while scheduled storage calculation", e);
}
historyJob.setIsRunning(false);
- // session.close();
+
logger.info("end history updating for all processes");
}
}
=== modified file 'src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java'
--- src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2012-02-22 14:09:22 +0000
@@ -74,7 +74,7 @@
crit = crit.setProjection(proj);
List<Object> list = crit.list();
- // session.
+
LuceneIndex li = LuceneIndex.initialize();
try {
=== removed file 'src/org/goobi/production/flow/jobs/TODO'
--- src/org/goobi/production/flow/jobs/TODO 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/jobs/TODO 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-TODO:
-- The Job manager should be able to operate in a cron like way. This should be configurablke via the gui ans stored in a configuration backend (XML Based)
\ No newline at end of file
=== modified file 'src/org/goobi/production/flow/statistics/StatisticsManager.java'
--- src/org/goobi/production/flow/statistics/StatisticsManager.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/StatisticsManager.java 2012-02-22 14:09:22 +0000
@@ -497,50 +497,4 @@
}
}
- // /**
- // * get List of String for iterating over indizes, which can be used to
- // * create html-tables, charts or csv-data
- // *
- // * @return List of {@link String} of calculated results
- // *************************************************************************************/
- // public List<String> getMyDataTableNames() {
- // return myDataTableNames;
- // }
- //
- // /**
- // * get List of HtmlTableRenderer for the calculated Datatables
- // *
- // * @return List of {@link HtmlTableRenderer} of calculated HtmlTableRenderer
- // *************************************************************************************/
- // public List<HtmlTableRenderer> getMyHtmlRenderer() {
- // return myHtmlRenderer;
- // }
- //
- // /**
- // * render given {@link DataTable} as Chart and write it to response stream
- // *
- // * @param out
- // * the {@link OutputStream} where to write
- // * @param data
- // * the {@link DataTable} to use for chart generation
- // * @throws IOException
- // * if an error occurs while imageIO is writing
- // *************************************************************************************/
- // public void renderAsChart(OutputStream out, Object data) throws IOException {
- // if (data instanceof Integer) {
- // ChartRenderer ir = new ChartRenderer();
- //
- // if (question.isRendererInverted(ir)) {
- // ir.setDataTable(myDataTables.get((Integer) data).getDataTableInverted());
- // } else {
- // ir.setDataTable(myDataTables.get((Integer) data));
- // }
- // ir.setSize(800, 600);
- // ir.setShowMeanValues(showAverage);
- // BufferedImage image = (BufferedImage) ir.getRendering();
- // ImageIO.write(image, "png", out);
- // }
- //
- // }
-
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java'
--- src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2012-02-22 14:09:22 +0000
@@ -402,7 +402,6 @@
****************************************************************************/
protected static void filterScanTemplate(Conjunction con, String tok) {
/* Filtering by signature */
- // crit.add(Restrictions.like("vorleig.titel", "%Signatur%"));
con
.add(Restrictions.like("vorleig.wert", "%" + tok.substring(5)
+ "%"));
@@ -418,10 +417,9 @@
****************************************************************************/
protected static void filterIds(Conjunction con, String tok) {
/* filtering by ids */
- // Disjunction dis = Restrictions.disjunction();
+
List<Integer> listIds = new ArrayList<Integer>();
if (tok.substring(5).length() > 0) {
- // tok.substring(5).split(" ")
String[] tempids = tok.substring(5).split(" ");
for (int i = 0; i < tempids.length; i++) {
int tempid = Integer.parseInt(tempids[i]);
@@ -664,9 +662,9 @@
if (conjProcesses != null || flagSteps) {
if (!flagProcesses) {
critProcess = crit.createCriteria("prozess", "proc");
- // crit.createAlias("proc.ProjekteID", "projID");
+
if (conjProcesses != null) {
- // inCrit.add(conjProcesses);
+
critProcess.add(conjProcesses);
}
} else {
@@ -693,7 +691,7 @@
crit.createCriteria("schritte", "steps");
crit.add(conjSteps);
} else {
- //inCrit.createAlias("schritte", "steps");
+
inCrit.add(conjSteps);
}
}
@@ -836,8 +834,6 @@
case name:
/* filter for a specific done step by it's name (Titel) */
- // myObservable.setMessage("Filter 'stepDone:" + parameters
- // + "' is not yet implemented and will be ignored!");
try {
FilterHelper.filterStepName(con, parameters, inStatus);
} catch (NullPointerException e) {
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2012-02-22 14:09:22 +0000
@@ -150,12 +150,10 @@
// getting localized time group unit
- // String identifier = timeGrouping.getTitle();
// setting row name with localized time group and the date/time extraction based on the group
dataRowChart.setName(new Converter(objArr[2]).getString() + "");
dataRow.setName(new Converter(objArr[2]).getString() + "");
- // dataRow.setName(new converter(objArr[2]).getString());
// building up row depending on requested output having different fields
switch (this.cu) {
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectAssociations.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectAssociations.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectAssociations.java 2012-02-22 14:09:22 +0000
@@ -96,7 +96,6 @@
List<DataTable> allTables = new ArrayList<DataTable>();
- //dtbl = dtbl.getDataTableInverted();
dtbl.setUnitLabel(Helper.getTranslation("project"));
allTables.add(dtbl);
return allTables;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java 2012-02-22 14:09:22 +0000
@@ -91,7 +91,7 @@
*/
public Boolean isDataComplete(){
-// this.resetErrorList();
+
Boolean error = false;
if (timeFilterFrom==null ){
logger.debug("time from is not set");
@@ -114,7 +114,7 @@
error = true;
}
return !error;
-// return !this.getHasErrors();
+
}
public void setReferenceCurve(Boolean flagIn){
@@ -161,7 +161,7 @@
* generate referenceCurve
*/
private DataRow referenceCurve(DataRow referenceRow) {
- DataRow orientationRow = requiredOutput(); //new DataRow(Helper.getTranslation("ReferenceCurve"));
+ DataRow orientationRow = requiredOutput();
DataRow dataRow = new DataRow(Helper.getTranslation("ReferenceCurve"));
dataRow.setShowPoint(false);
// may have to be calculated differently
@@ -171,11 +171,6 @@
Double remainingOutput = this.requiredDailyOutput * this.timeGrouping.getDayFactor() * count;
Double remainingAverageOutput = remainingOutput / count;
-// DateTime from = new DateTime(this.timeFilterFrom);
-// DateTime today = new DateTime(new Date());
-//
-// Days.daysBetween(from, today);
-
// the way this is calculated is by subtracting each value from the total remaining output
// and calculating the averageOutput based on the remaining output and the remaining periods
for(int i=0; i< orientationRow.getNumberValues(); i++){
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2012-02-22 14:09:22 +0000
@@ -121,7 +121,6 @@
//setting row name with date/time extraction based on the group
dataRow.setName(new Converter(objArr[1]).getString() + "");
- //dataRow.setName(new converter(objArr[2]).getString());
dataRow.addValue(Helper.getTranslation("storageDifference"),
(new Converter(objArr[0]).getGB()));
@@ -163,7 +162,6 @@
* @see org.goobi.production.flow.statistics.IStatisticalQuestion#isRendererInverted(de.intranda.commons.chart.renderer.IRenderer)
*/
public Boolean isRendererInverted(IRenderer inRenderer) {
- // return false;
return inRenderer instanceof ChartRenderer;
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestThroughput.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestThroughput.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestThroughput.java 2012-02-22 14:09:22 +0000
@@ -173,14 +173,10 @@
DataTable tableStepOpen;
tableStepOpen = getSpecificSteps(i, HistoryEventType.stepOpen);
- //dtbl = dtbl.getDataTableInverted();
- //dtbl1.setName(Helper.getTranslation("openSteps") + " " + i.toString());
tableStepOpen.setShowableInTable(true);
DataTable tableStepDone;
tableStepDone = getSpecificSteps(i, HistoryEventType.stepDone);
- //dtbl = dtbl.getDataTableInverted();
- //dtbl2.setName(Helper.getTranslation("doneSteps") + " " + i.toString());
tableStepDone.setShowableInTable(true);
// to merge we just take each table and dump the entire content in a
@@ -424,9 +420,6 @@
// now removing headerRow
if (headerRow != null) {
dtbl.removeDataRow(headerRow);
- // if a row showing the total count over all intervalls should be added to the grid
- //the folloing line can be commented in (adding the header to the bottom)
- //dtbl.addDataRow(headerRow);
}
return dtbl;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2012-02-22 14:09:22 +0000
@@ -63,8 +63,6 @@
throw new UnsupportedOperationException("This implementation of IStatisticalQuestion needs an IDataSource for method getDataSets()");
}
- // Criteria crit = originalFilter.getCriteria();
-
Criteria crit = Helper.getHibernateSession().createCriteria(Schritt.class);
crit.add(Restrictions.or(Restrictions.eq("bearbeitungsstatus", Integer.valueOf(1)), Restrictions.like("bearbeitungsstatus", Integer.valueOf(2))));
@@ -88,7 +86,6 @@
dtbl.addDataRow(dRow);
List<DataTable> allTables = new ArrayList<DataTable>();
- //dtbl = dtbl.getDataTableInverted();
dtbl.setUnitLabel(Helper.getTranslation("benutzergruppe"));
allTables.add(dtbl);
return allTables;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2012-02-22 14:09:22 +0000
@@ -62,8 +62,6 @@
throw new UnsupportedOperationException("This implementation of IStatisticalQuestion needs an IDataSource for method getDataSets()");
}
- // Criteria crit = originalFilter.getCriteria();
-
Criteria crit = Helper.getHibernateSession().createCriteria(Schritt.class);
crit.add(Restrictions.or(Restrictions.eq("bearbeitungsstatus", Integer.valueOf(1)), Restrictions.like("bearbeitungsstatus", Integer.valueOf(2))));
@@ -86,7 +84,6 @@
dtbl.addDataRow(dRow);
List<DataTable> allTables = new ArrayList<DataTable>();
- //dtbl = dtbl.getDataTableInverted();
dtbl.setUnitLabel(Helper.getTranslation("arbeitsschritt"));
allTables.add(dtbl);
return allTables;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2012-02-22 14:09:22 +0000
@@ -22,7 +22,6 @@
package org.goobi.production.flow.statistics.hibernate;
-//import java.lang.ref.WeakReference;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
@@ -58,7 +57,7 @@
****************************************************************************/
public class UserDefinedFilter implements IEvaluableFilter {
private static final long serialVersionUID = 4715772407607416975L;
-// private Criteria myCriteria = null;
+
private WeakReference<Criteria> myCriteria = null;
private String myName = null;
private String myFilterExpression = null;
@@ -92,23 +91,6 @@
*/
public Criteria getCriteria() {
- // myCriteria is a WeakReference ... both cases needs to be evaluated,
- // after gc the WeakReference
- // object is still referenced but not the object referenced by it
-// if (myCriteria == null ) {
-// if (this.myIds == null) {
-// if (this.getFilter() != null) {
-// myCriteria =
-// createCriteriaFromFilterString(this.getFilter());
-// }
-// } else {
-// myCriteria =
-// createCriteriaFromIDList();
-// }
-// }
-//
-// return myCriteria;
-//
if (myCriteria == null || myCriteria.get() == null) {
if (this.myIds == null) {
if (this.getFilter() != null) {
@@ -194,9 +176,6 @@
PaginatingCriteria crit = new PaginatingCriteria(Prozess.class, session);
crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- //crit.createCriteria("projekt", "proj");
- //FilterHelper.limitToUserAccessRights(crit);
-
/*
* --------------------------------
* combine all parameters together this
@@ -214,15 +193,10 @@
* by using a range the Criteria produces more than one item per
* process, for each step it involves
**/
-// if (myParameter.getCriticalQuery()) {
-
- createIDListFromCriteria(crit);
- crit = null;
- crit = createCriteriaFromIDList();
-// }
+ createIDListFromCriteria(crit);
+ crit = null;
+ crit = createCriteriaFromIDList();
-// crit.add(Restrictions.in("id", crit.getIds()));
-
return crit;
}
@@ -248,7 +222,7 @@
private PaginatingCriteria createCriteriaFromIDList() {
Session session = Helper.getHibernateSession();
PaginatingCriteria crit = new PaginatingCriteria(Prozess.class, session);
- // crit = session.createCriteria(Prozess.class);
+
crit.add(Restrictions.in("id", myIds));
return crit;
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2012-02-22 14:09:22 +0000
@@ -96,7 +96,6 @@
private Criteria createCriteriaFromIDList() {
Session session = Helper.getHibernateSession();
Criteria crit = new PaginatingCriteria(Schritt.class, session);
- // crit = session.createCriteria(Prozess.class);
crit.add(Restrictions.in("id", myIds));
return crit;
}
@@ -114,10 +113,6 @@
* --------------------------------
*/
- // following was moved to Filter Helper
- // limitToUserAssignedSteps(crit);
-
-
String message = FilterHelper.criteriaBuilder(myFilter, crit, null, null, stepOpenOnly, userAssignedStepsOnly);
if (message.length() > 0) {
myObservable.setMessage(message);
@@ -247,116 +242,4 @@
+ this.getClass().getName() + " does not implement stepDoneName() ");
}
-/* private void limitToUserAssignedSteps(Criteria inCrit) {
- show only open Steps or those in use by current user
- Session session = Helper.getHibernateSession();
- identify current user
- LoginForm login = (LoginForm) Helper
- .getManagedBeanValue("#{LoginForm}");
- if (login.getMyBenutzer() == null)
- return;
- init id-list, preset with item 0
- List<Integer> idList = new ArrayList<Integer>();
- idList.add(Integer.valueOf(0));
-
-
- * -------------------------------- hits by user groups
- * --------------------------------
-
- Criteria critGroups = session.createCriteria(Schritt.class);
-
- if (stepOpenOnly)
- critGroups.add(Restrictions.eq("bearbeitungsstatus", Integer
- .valueOf(1)));
- else if (userAssignedStepsOnly) {
- critGroups.add(Restrictions.eq("bearbeitungsstatus", Integer
- .valueOf(2)));
- critGroups.add(Restrictions.eq("bearbeitungsbenutzer.id", login
- .getMyBenutzer().getId()));
- } else
- critGroups.add(Restrictions.or(Restrictions.eq(
- "bearbeitungsstatus", Integer.valueOf(1)), Restrictions
- .like("bearbeitungsstatus", Integer.valueOf(2))));
-
- only processes which are not templates
- Criteria temp = critGroups.createCriteria("prozess", "proz");
- critGroups.add(Restrictions.eq("proz.istTemplate", Boolean
- .valueOf(false)));
-
- only assigned projects
- temp.createCriteria("projekt", "proj").createCriteria("benutzer",
- "projektbenutzer");
- critGroups.add(Restrictions.eq("projektbenutzer.id", login
- .getMyBenutzer().getId()));
-
-
- * only steps assigned to the user groups the current user is member of
-
- critGroups.createCriteria("benutzergruppen", "gruppen")
- .createCriteria("benutzer", "gruppennutzer");
- critGroups.add(Restrictions.eq("gruppennutzer.id", login
- .getMyBenutzer().getId()));
-
- collecting the hits
- // TODO: Try to avoid Iterators, use for loops instead
- critGroups.setProjection(Projections.id());
- for (Iterator<Object> it = critGroups.setFirstResult(0).setMaxResults(
- Integer.MAX_VALUE).list().iterator(); it.hasNext();) {
- idList.add((Integer) it.next());
- }
-
-
- * -------------------------------- Users only
- * --------------------------------
-
- Criteria critUser = session.createCriteria(Schritt.class);
-
- if (stepOpenOnly)
- critUser.add(Restrictions.eq("bearbeitungsstatus", Integer
- .valueOf(1)));
- else if (userAssignedStepsOnly) {
- critUser.add(Restrictions.eq("bearbeitungsstatus", Integer
- .valueOf(2)));
- critUser.add(Restrictions.eq("bearbeitungsbenutzer.id", login
- .getMyBenutzer().getId()));
- } else
- critUser.add(Restrictions.or(Restrictions.eq(
- "bearbeitungsstatus", Integer.valueOf(1)), Restrictions
- .like("bearbeitungsstatus", Integer.valueOf(2))));
-
- exclude templates
- Criteria temp2 = critUser.createCriteria("prozess", "proz");
- critUser.add(Restrictions.eq("proz.istTemplate", Boolean
- .valueOf(false)));
-
- check project assignment
- temp2.createCriteria("projekt", "proj").createCriteria("benutzer",
- "projektbenutzer");
- critUser.add(Restrictions.eq("projektbenutzer.id", login
- .getMyBenutzer().getId()));
-
- only steps where the user is assigned to
- critUser.createCriteria("benutzer", "nutzer");
- critUser.add(Restrictions.eq("nutzer.id", login.getMyBenutzer()
- .getId()));
-
- collecting the hits
- // TODO: Try to avoid Iterators, use for loops instead
- critUser.setProjection(Projections.id());
- for (Iterator<Object> it = critUser.setFirstResult(0)
- .setMaxResults(Integer.MAX_VALUE).list().iterator(); it
- .hasNext();) {
- idList.add((Integer) it.next());
- }
-
-
- * --------------------------------
- * only taking the hits by restricting
- * to the ids --------------------------------
-
- inCrit.add(Restrictions.in("id", idList));
- //setting list of class variable for availability
- myIds = (ArrayList<Integer>) idList;
- }*/
-
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2012-02-22 14:09:22 +0000
@@ -45,7 +45,7 @@
private static final long serialVersionUID = 441692997066826360L;
private Integer projectID;
-// private Criteria myCriteria = null;
+
private WeakReference<Criteria> myCriteria = null;
private List<Integer> myIds = null;
private Dispatcher myObservable;
@@ -56,23 +56,7 @@
}
public Criteria getCriteria() {
- // myCriteria is a WeakReference ... both cases needs to be evaluated,
- // after gc the WeakReference
- // object is still referenced but not the object referenced by it
-// if (myCriteria == null) {
-// if (this.myIds == null) {
-// if (this.projectID != null) {
-// myCriteria =
-// createCriteriaFromProjectID();
-// }
-// } else {
-// myCriteria =
-// createCriteriaFromIDList();
-// }
-// }
-//
-// return myCriteria;
-
+
if (myCriteria == null || myCriteria.get() == null) {
if (this.myIds == null) {
if (this.projectID != null) {
@@ -103,7 +87,7 @@
private PaginatingCriteria createCriteriaFromIDList() {
Session session = Helper.getHibernateSession();
PaginatingCriteria crit = new PaginatingCriteria(Prozess.class, session);
- // crit = session.createCriteria(Prozess.class);
+
crit.add(Restrictions.in("id", myIds));
return crit;
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2012-02-22 14:09:22 +0000
@@ -51,9 +51,6 @@
PaginatingCriteria crit = new PaginatingCriteria(Prozess.class, session);
FilterHelper.criteriaBuilder(null, crit, true, null, null, null);
- // FilterHelper.limitToUserAccessRights(crit);
- // crit.add(Restrictions.eq("istTemplate", Boolean.valueOf(true)));
-
return crit;
}
=== modified file 'src/org/goobi/production/importer/FireburnDataImport.java'
--- src/org/goobi/production/importer/FireburnDataImport.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/importer/FireburnDataImport.java 2012-02-22 14:09:22 +0000
@@ -133,11 +133,6 @@
fdi.pFoundList.add(p);
// write to Goobi
fdi.writeToGoobiDB(p, processId);
- // logger.debug("StoreIdentifier, found in process Table: "
- // + storeIdentifier
- // + " Title: "
- // + p.titel);
-
}
// processId is not found.
else {
@@ -444,7 +439,7 @@
+ "('" + processId + "','" + size + "','" + p.size + "',false,'5',false,'" + p.date + "')" + ";";
// Execute the insert statement
stmt.executeUpdate(sql);
- // logger.debug(sql);
+
logger.debug("Write to Goobi: " + p.cdName + " " + processId + " " + p.date);
}
=== modified file 'src/org/goobi/production/importer/OpacMassImport.java'
--- src/org/goobi/production/importer/OpacMassImport.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/importer/OpacMassImport.java 2012-02-22 14:09:22 +0000
@@ -61,8 +61,6 @@
this.template = template;
this.ruleset = template.getRegelsatz().getPreferences();
this.format = format;
- // this.form = form;
- // this.template = form.getProzessVorlage();
}
/**
@@ -75,8 +73,6 @@
this.template = template;
setRuleset(template.getRegelsatz().getPreferences());
this.format = format;
- // this.form = form;
-
}
/**
=== modified file 'src/org/goobi/production/importer/ProductionDataImport.java'
--- src/org/goobi/production/importer/ProductionDataImport.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/importer/ProductionDataImport.java 2012-02-22 14:09:22 +0000
@@ -121,9 +121,6 @@
logger.debug("Load Production Data from xml.");
ArrayList<ProductionData> dataList = load(filename);
logger.debug("Got " + dataList.size() + " items");
- // Session session = HibernateUtilOld.getSessionFactory().openSession();
-
- // Session session = Helper.getHibernateSession();
Prozess template = new Prozess();
template.setProjekt(altdaten);
@@ -135,7 +132,6 @@
template.setRegelsatz(ruleset);
- // session.save(altdaten);
session.save(template);
Set<Schritt> step = getSteps(template);
template.setSchritte(step);
@@ -193,7 +189,6 @@
}
}
if (++i % 40 == 0) {
- // logger.debug("clear cache");
session.flush();
session.clear();
}
@@ -211,7 +206,6 @@
private void generateNewPropertiesForNewProzess(Session session, Regelsatz ruleset, Projekt project, ProductionData pd)
throws HibernateException, SQLException {
- // Session session = HibernateUtilOld.getSessionFactory().openSession();
// generate new Process
@@ -221,9 +215,7 @@
String title = pd.getWERKATS() + "_" + pd.getWERKPPNDIGITAL();
title = title.replaceAll("\\W", "");
prozess.setTitel(title);
-// if (prozess.getTitel().contains(" ")) {
-// prozess.setTitel(prozess.getTitel().replaceAll(" ", ""));
-// }
+
prozess.setIstTemplate(false);
prozess.setRegelsatz(ruleset);
Werkstueck werk = new Werkstueck();
@@ -272,7 +264,6 @@
for (Schritt s : step) {
session.save(s);
}
- // prozess.setSchritte(getSteps(prozess));
session.save(prozess);
try {
@@ -346,8 +337,6 @@
private void getNewPropertiesForNewProcesses(Session session, Prozess prozess, ProductionData pd) throws HibernateException, SQLException,
ConfigurationException {
- // ArrayList<HibernateGoobiProperty> newPropertiesList = new ArrayList<HibernateGoobiProperty>();
-
// Generate Properties
prozess.setErstellungsdatum(pd.getDATUMAUFNAHMEWERK());
generateProzessProperty(session, prozess, "ImportMarker", "created", PropertyType.String, 0, false);
@@ -398,17 +387,13 @@
}
Werkstueck werkstueck = prozess.getWerkstueckeList().get(0);
- // w.setProzess(p);
+
String ppn = pd.getWERKPPNDIGITAL();
if (ppn != null) {
if (ppn.startsWith("ppn") || ppn.startsWith("PPN")) {
ppn = ppn.substring(3);
}
- // session.save(w);
- // PPN digital f-Satz
- // List<IGoobiProperty> prps = new
- // ArrayList<IGoobiProperty>();
generateWerkProperty(session, werkstueck, "PPN digital f-Satz", ppn, PropertyType.String, 0, false);
}
@@ -418,14 +403,13 @@
if (ppn.startsWith("ppn") || ppn.startsWith("PPN")) {
ppn = ppn.substring(3);
}
- // List<IGoobiProperty> proplist = new
- // ArrayList<IGoobiProperty>();
+
generateVorlageProperty(session, v, "PPN analog f-Satz", ppn, PropertyType.String, 0, false);
- // proplist.add(propPPNA);
+
generateVorlageProperty(session, v, "Signatur", pd.getWERKSIGNATUR(), PropertyType.String, 0, false);
}
- // p.setProperties(newProcessProperties);
+
for (Schritt s : prozess.getSchritte()) {
if (s.getTitel().contains("Bibliographisch") || (s.getTitel().contains("bibliographische "))) {
s.setBearbeitungsende(pd.getDATUMAUFNAHMEWERK());
@@ -440,8 +424,6 @@
s.setBearbeitungsende(pd.getWERKSCANDATUM());
s.setEditTypeEnum(StepEditType.ADMIN);
s.setBearbeitungsstatusEnum(StepStatus.DONE);
- // List<IGoobiProperty> proplist = new
- // ArrayList<IGoobiProperty>();
// WERKSCANSEITEN
generateStepProperty(session, s, "Seitenanzahl", String.valueOf(pd.getWERKSCANSEITEN()), PropertyType.Integer, 0, false);
@@ -471,8 +453,6 @@
s.setBearbeitungsstatusEnum(StepStatus.DONE);
s.setEditTypeEnum(StepEditType.ADMIN);
- // List<IGoobiProperty> proplist = new
- // ArrayList<IGoobiProperty>();
// BITONALIMAGENACHBEARBEITUNG
generateStepProperty(session, s, "BitonalImageNachbearbeitung", pd.getBITONALIMAGENACHBEARBEITUNG(), PropertyType.String, 0, false);
@@ -490,25 +470,14 @@
generateStepProperty(session, s, "DatumBitonalImageNachbearbeitung", String.valueOf(pd.getImageNachbearbBitonalDatum()),
PropertyType.Date, 0, false);
- // ImageNachbearbBitonalPerson
- // generateStepProperty(session, s, "PersonBitonalImageCorrection", pd.getImageNachbearbBitonalPerson(), PropertyType.String, 0,
- // false);
-
// ImageNachbearbGrauDatum
generateStepProperty(session, s, "DatumGrauImageNachbearbeitung", String.valueOf(pd.getImageNachbearbGrauDatum()), PropertyType.Date,
0, false);
- // ImageNachbearbGrauPerson
- // generateStepProperty(session, s, "PersonGrayscaleImageCorrection", pd.getImageNachbearbGrauPerson(), PropertyType.String, 0,
- // false);
-
// ImageNachbearbFarbeDatum
generateStepProperty(session, s, "DatumFarbImageNachbearbeitung", String.valueOf(pd.getImageNachbearbFarbeDatum()),
PropertyType.Date, 0, false);
- // ImageNachbearbFarbePerson
- // generateStepProperty(session, s, "PersonColorImageCorrection", pd.getImageNachbearbFarbePerson(), PropertyType.String, 0, false);
-
/********************************************
* step 'Archiv' *
*******************************************/
@@ -535,9 +504,6 @@
private void addNewPropertiesForExistingProcesses(Session session, int pId, ProductionData pd) throws HibernateException, SQLException,
ConfigurationException {
- // Session session = Helper.getHibernateSession();
- // Session session = HibernateUtilOld.getSessionFactory().openSession();
- // Prozess holen
Prozess p = null;
Criteria crit = session.createCriteria(Prozess.class).add(Restrictions.eq("id", pId));
if (crit.list().size() > 0) {
@@ -784,28 +750,19 @@
generateStepProperty(session, s, "DatumBitonalImageNachbearbeitung", String.valueOf(pd.getImageNachbearbBitonalDatum()), PropertyType.Date,
0, false);
- // ImageNachbearbBitonalPerson
-// generateStepProperty(session, s, "PersonBitonalImageCorrection", pd.getImageNachbearbBitonalPerson(), PropertyType.String, 0, false);
-
// ImageNachbearbGrauDatum
generateStepProperty(session, s, "DatumGrauImageNachbearbeitung", String.valueOf(pd.getImageNachbearbGrauDatum()), PropertyType.Date,
0, false);
- // ImageNachbearbGrauPerson
-// generateStepProperty(session, s, "PersonGrayscaleImageCorrection", pd.getImageNachbearbGrauPerson(), PropertyType.String, 0, false);
-
// ImageNachbearbFarbeDatum
generateStepProperty(session, s, "DatumFarbeImageNachbearbeitung", String.valueOf(pd.getImageNachbearbFarbeDatum()), PropertyType.Date, 0,
false);
- // ImageNachbearbFarbePerson
-// generateStepProperty(session, s, "PersonColorImageCorrection", pd.getImageNachbearbFarbePerson(), PropertyType.String, 0, false);
-
/********************************************
* step 'Archiv' *
*******************************************/
} else if (s.getTitel().contains("Archivierung")) {
- // List<IGoobiProperty> proplist = s.getProperties();
+
generateStepProperty(session, s, "CD-Sicherung-BK", pd.getCDSICHERUNG(), PropertyType.String, 0, false);
// MAARCHIV
=== modified file 'src/org/goobi/production/search/lucene/LuceneFilter.java'
--- src/org/goobi/production/search/lucene/LuceneFilter.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/search/lucene/LuceneFilter.java 2012-02-22 14:09:22 +0000
@@ -50,7 +50,7 @@
private static final long serialVersionUID = 8756951004361151313L;
private String myName;
private String myFilterExpression = null;
-// private Criteria myCriteria = null;
+
private WeakReference<Criteria> myCriteria = null;
private List<Integer> myIds;
private Dispatcher myObservable;
@@ -82,18 +82,6 @@
* @see org.goobi.production.flow.statistics.hibernate.IEvaluableFilter#getCriteria ()
*/
public Criteria getCriteria() {
-// if (myCriteria == null) {
-// if (this.myIds == null) {
-// if (this.getFilter() != null) {
-// myCriteria =createCriteriaFromLucene(this.getFilter());
-// }
-// } else {
-// myCriteria = createCriteriaFromIDList();
-// }
-// }
-//
-// return myCriteria;
-
if (myCriteria == null || myCriteria.get() == null) {
if (this.myIds == null) {
if (this.getFilter() != null) {
=== modified file 'src/org/goobi/production/search/lucene/LuceneIndex.java'
--- src/org/goobi/production/search/lucene/LuceneIndex.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/search/lucene/LuceneIndex.java 2012-02-22 14:09:22 +0000
@@ -68,7 +68,7 @@
*/
public class LuceneIndex implements IIndexer {
private static final Logger logger = Logger.getLogger(LuceneIndex.class);
- // Helper help = new Helper();
+
static RAMDirectory ramDir = null;
private static String index_path = "";
private static String analyser_path = "";
@@ -79,20 +79,14 @@
private static IndexWriter iwriter;
private Version luceneVersion = Version.LUCENE_29;
-// private static SimpleDateFormat formatter = new SimpleDateFormat("yyyymmdd");
-
/**
* Constructor, reads configuration from main configuration file
*/
private LuceneIndex() {
-// analyser_path = ConfigMain.getParameter("analyser", "GermanAnalyser");
+
index_path = ConfigMain.getParameter("index_path", new Helper().getGoobiDataDirectory());
-// if (analyser_path == "GermanAnalyser") {
-// analyser = new GermanAnalyzer(luceneVersion);
-// } else {
- analyser = new StandardAnalyzer(luceneVersion);
-// }
+ analyser = new StandardAnalyzer(luceneVersion);
}
/**
@@ -137,7 +131,7 @@
private static Document getNewDocument(Prozess process) {
Document doc = new Document();
- // if (!process.getProjekt().getTitel().contains("Altdaten")) {
+
// nessesary to remove filter
doc.add(new Field("all", "true", Field.Store.YES, Field.Index.NOT_ANALYZED));
// name information
@@ -233,28 +227,7 @@
}
}
}
- // Metadata
-/*
- try {
- Fileformat ff = process.readMetadataFile();
- if (ff != null) {
- DigitalDocument dd = ff.getDigitalDocument();
- if (dd != null) {
- DocStruct topstruct = dd.getLogicalDocStruct();
- if (topstruct != null) {
- List<Field> meta = getMetaData(topstruct);
- if (meta != null) {
- for (Field e : meta) {
- doc.add(e);
- }
- }
- }
- }
- }
- } catch (Exception e) {
- logger.error("no metadata found: " + e);
- }
- */
+
try {
File f = new File(process.getImagesTifDirectory());
File[] filelist = f.listFiles();
@@ -328,7 +301,7 @@
doc.add(new Field(SearchEnums.ruleset.getLuceneTitle(), process.getRegelsatz().getTitel().toLowerCase(), Field.Store.YES,
Field.Index.NOT_ANALYZED));
}
- // }
+
return doc;
}
@@ -372,13 +345,9 @@
public void addObject(Prozess process) {
if (ConfigMain.getBooleanParameter("useLucene")) {
try {
- // IndexWriter iwriter = new IndexWriter(index_path, analyser,
- // false, mfl);
iwriter.addDocument(getNewDocument(process));
- // iwriter.close();
} catch (Exception e) {
Helper.setFehlerMeldung("could not add process to index", e);
- // logger.error(e);
}
}
}
@@ -391,10 +360,7 @@
public void removeObject(Prozess process) {
if (ConfigMain.getBooleanParameter("useLucene")) {
try {
- // IndexWriter iwriter = new IndexWriter(index_path, analyser,
- // false, mfl);
iwriter.deleteDocuments(new Term(SearchEnums.processId.getLuceneTitle(), String.valueOf(process.getId().intValue())));
- // iwriter.close();
} catch (Exception e) {
// do nothing, process is not in index
}
=== modified file 'src/org/goobi/production/search/lucene/LuceneSearch.java'
--- src/org/goobi/production/search/lucene/LuceneSearch.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/production/search/lucene/LuceneSearch.java 2012-02-22 14:09:22 +0000
@@ -63,13 +63,8 @@
*/
private LuceneSearch() {
- // analyser_path = ConfigMain.getParameter("analyser", "GermanAnalyser");
- index_path = ConfigMain.getParameter("index_path");
- // if (analyser_path == "GermanAnalyser") {
- // analyser = new GermanAnalyzer(luceneVersion);
- // } else {
+ index_path = ConfigMain.getParameter("index_path");
analyser = new StandardAnalyzer(luceneVersion);
- // }
}
/**
@@ -101,12 +96,8 @@
*/
private ArrayList<Integer> search(String inQuery, ParametersData param) {
- // inQuery = inQuery.toLowerCase();
+
String luceneQuery = "";
- // Never forget: Strings are immutable
- // inQuery = inQuery.trim();
- // Don't use "isEmpty()", it's a feature of Java 1.6
- // See http://java.sun.com/javase/6/docs/api/java/lang/String.html#isEmpty()
// Don't use Java 1.5, even sun says you shouldn't use 1.5 longer
if (inQuery.length() == 0) {
@@ -290,10 +281,6 @@
if (hits != null && hits.totalHits > 0) {
for (int i = 0; i < hits.totalHits; i++) {
Document hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
-// Field[] fields = hitDoc.getFields("signatur");
-// for (Field f : fields) {
-// System.out.println("signatur: " + f.stringValue());
-// }
myhits.add(Integer.parseInt(hitDoc.get("id")));
}
}
=== modified file 'src/org/goobi/samples/PdfGeneratorSample.java'
--- src/org/goobi/samples/PdfGeneratorSample.java 2011-12-20 08:07:09 +0000
+++ src/org/goobi/samples/PdfGeneratorSample.java 2012-02-22 14:09:22 +0000
@@ -66,9 +66,6 @@
Result res = new SAXResult(fop.getDefaultHandler());
xslfoTransformer.transform(source, res);
- // if you want to get the PDF bytes, use the following code
- //return outStream.toByteArray();
-
// if you want to save PDF file use the following code
File pdffile = new File(rootpath +"target.pdf");
OutputStream out = new java.io.FileOutputStream(pdffile);
@@ -78,14 +75,6 @@
str.close();
out.close();
- // to write the content to out put stream
- // byte[] pdfBytes = outStream.toByteArray();
- // respon se.setContentLength(pdfBytes.length);
- // response.setContentType("application/pdf");
- // response.addHeader("Content-Disposition", "attachment;filename=pdffile.pdf");
- // response.getOutputStream().write(pdfBytes);
- // response.getOutputStream().flush();
-
}
private static Transformer getTransformer(StreamSource streamSource) {
=== modified file 'test/src/de/sub/goobi/helper/importer/ImportOpacTest.java'
--- test/src/de/sub/goobi/helper/importer/ImportOpacTest.java 2012-02-15 15:05:05 +0000
+++ test/src/de/sub/goobi/helper/importer/ImportOpacTest.java 2012-02-22 14:09:22 +0000
@@ -18,14 +18,6 @@
Prefs myPrefs = new Prefs();
myPrefs.loadPrefs(args[0]);
Fileformat myRdf = myImportOpac.OpacToDocStruct("7", "9783518456934", "SBB", myPrefs);
-// if (myImportOpac.isMonograph())
-// docType = "monograph";
-// if (myImportOpac.isContainedWork())
-// docType = "containedwork";
-// if (myImportOpac.isPeriodical())
-// docType = "periodical";
-// if (myImportOpac.isMultivolume())
-// docType = "multivolume";
atstsl = myImportOpac.getAtstsl();
System.out.println(atstsl);
=== modified file 'test/src/de/sub/goobi/samples/BenutzerTest.java'
--- test/src/de/sub/goobi/samples/BenutzerTest.java 2012-02-15 15:05:05 +0000
+++ test/src/de/sub/goobi/samples/BenutzerTest.java 2012-02-22 14:09:22 +0000
@@ -24,7 +24,7 @@
public void testLogin2() {
Benutzer b = new Benutzer();
b.setLogin("ein Name");
-// b.setMitMassendownload(true);
+
assertTrue("wert falsch" ,b.isMitMassendownload());
assertEquals("ein Name", b.getLogin());
}
=== modified file 'test/src/org/goobi/production/flow/statistics/hibernate/SQLHelperTest.java'
--- test/src/org/goobi/production/flow/statistics/hibernate/SQLHelperTest.java 2012-02-15 14:39:13 +0000
+++ test/src/org/goobi/production/flow/statistics/hibernate/SQLHelperTest.java 2012-02-22 14:09:22 +0000
@@ -8,7 +8,6 @@
@Test
public void testGetWhereClauseForTimeFrame() {
- //String testString = "intervall>=5 AND intervall<=1";
String testString = "date_format(Field1";
assertTrue(SQLGenerator.getWhereClauseForTimeFrame(new Date(), new Date(768000232), new String("Field1")).contains(testString));
}
=== modified file 'test/src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrectionsTest.java'
--- test/src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrectionsTest.java 2012-02-15 15:05:05 +0000
+++ test/src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrectionsTest.java 2012-02-22 14:09:22 +0000
@@ -28,10 +28,6 @@
@BeforeClass
public static void setUp() {
- //TODO: HIBERNATE fix
-// Configuration cfg = HibernateUtil.getConfiguration();
-// cfg.setProperty("hibernate.connection.url", "jdbc:mysql://localhost/testgoobi");
-// HibernateUtil.rebuildSessionFactory();
test = new StatQuestCorrections();
}
=== modified file 'test/src/org/goobi/production/flow/statistics/hibernate/StatQuestProductionTest.java'
--- test/src/org/goobi/production/flow/statistics/hibernate/StatQuestProductionTest.java 2012-02-15 15:05:05 +0000
+++ test/src/org/goobi/production/flow/statistics/hibernate/StatQuestProductionTest.java 2012-02-22 14:09:22 +0000
@@ -37,10 +37,6 @@
@BeforeClass
public static void setUp() {
- //TODO: HIBERNATE fix
-// Configuration cfg = HibernateUtil.getConfiguration();
-// cfg.setProperty("hibernate.connection.url", "jdbc:mysql://localhost/testgoobi");
-// HibernateUtil.rebuildSessionFactory();
test = new StatQuestProduction();
}
Follow ups
