Crearte statement from batch edit

.gitignore

@@ -162,7 +162,6 @@ pip-log.txt
 # Mac crap
 .DS_Store
 /YOUR JREBEL LICENSE HAS EXPIRED!.error
-digilib-config.xml
 items-out.xml
 
 # jRebel

pom.xml

@@ -429,33 +429,6 @@
 			<artifactId>im4java</artifactId>
 			<version>1.2.0</version>
 		</dependency>
-		<!-- START: Digilib integration -->
-		<dependency>
-			<groupId>digilib</groupId>
-			<artifactId>digilib-servlet2</artifactId>
-			<version>2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>digilib</groupId>
-			<artifactId>digilib-common</artifactId>
-			<version>2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>digilib</groupId>
-			<artifactId>digilib-servlet</artifactId>
-			<version>2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.devlib.schmidt</groupId>
-			<artifactId>imageinfo</artifactId>
-			<version>1.9</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.jai-imageio</groupId>
-			<artifactId>jai-imageio-core</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-		<!-- END: Digilib integration -->
 		<dependency>
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-parsers</artifactId>

src/main/java/de/mpg/imeji/logic/ImejiInitializer.java

@@ -61,11 +61,15 @@ public class ImejiInitializer {
    * @throws ImejiException
    *
    */
-  public static void init() throws IOException, URISyntaxException, ImejiException {
-    Imeji.tdbPath = PropertyReader.getProperty("imeji.tdb.path");
-    ElasticInitializer.start();
-    ImejiInitializer.init(Imeji.tdbPath);
-    Imeji.getNIGHTLY_EXECUTOR().start();
+  public static void init() {
+    try {
+      Imeji.tdbPath = PropertyReader.getProperty("imeji.tdb.path");
+      ElasticInitializer.start();
+      ImejiInitializer.init(Imeji.tdbPath);
+      Imeji.getNIGHTLY_EXECUTOR().start();
+    } catch (Exception e) {
+      LOGGER.fatal("Error initializing imeji", e);
+    }
   }
 
 

src/main/java/de/mpg/imeji/logic/config/ImejiProperties.java

@@ -17,10 +17,6 @@
  *
  */
 public class ImejiProperties {
-  /**
-   * True if Digilib is enabled
-   */
-  private boolean digilibEnabled = false;
   /**
    * The base of the path to the internal storage
    */
@@ -46,7 +42,6 @@ public ImejiProperties() {
   public void load() {
     try {
       PropertyReader.loadProperties();
-      digilibEnabled = Boolean.parseBoolean(getProperty("imeji.digilib.enable"));
       internalStorageBase = FilenameUtils
           .getBaseName(FilenameUtils.normalizeNoEndSeparator(getProperty("imeji.storage.path")));
       applicationURL = StringHelper.normalizeURI(getProperty("imeji.instance.url"));
@@ -90,13 +85,6 @@ private void readBaseUri() {
     ObjectHelper.baseUri = baseURI;
   }
 
-  /**
-   * @return the digilibEnabled
-   */
-  public boolean isDigilibEnabled() {
-    return digilibEnabled;
-  }
-
   /**
    * @return the internalStorageBase
    * @throws URISyntaxException

src/main/java/de/mpg/imeji/logic/controller/resource/AlbumController.java

@@ -24,6 +24,7 @@
 import de.mpg.imeji.exceptions.UnprocessableError;
 import de.mpg.imeji.j2j.helper.J2JHelper;
 import de.mpg.imeji.logic.Imeji;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.reader.ReaderFacade;
 import de.mpg.imeji.logic.search.Search;
 import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
@@ -40,7 +41,6 @@
 import de.mpg.imeji.logic.search.model.SortCriterion;
 import de.mpg.imeji.logic.security.util.SecurityUtil;
 import de.mpg.imeji.logic.service.ImejiServiceAbstract;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.vo.Album;
 import de.mpg.imeji.logic.vo.Item;
 import de.mpg.imeji.logic.vo.Properties.Status;

src/main/java/de/mpg/imeji/logic/controller/resource/CollectionController.java

@@ -23,6 +23,7 @@
 import de.mpg.imeji.exceptions.UnprocessableError;
 import de.mpg.imeji.j2j.helper.J2JHelper;
 import de.mpg.imeji.logic.Imeji;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.reader.ReaderFacade;
 import de.mpg.imeji.logic.search.Search;
 import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
@@ -38,7 +39,6 @@
 import de.mpg.imeji.logic.search.model.SortCriterion;
 import de.mpg.imeji.logic.security.util.SecurityUtil;
 import de.mpg.imeji.logic.service.ImejiServiceAbstract;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.validation.impl.CollectionValidator;
 import de.mpg.imeji.logic.validation.impl.Validator.Method;
 import de.mpg.imeji.logic.vo.CollectionImeji;

src/main/java/de/mpg/imeji/logic/export/ExportManager.java

@@ -16,10 +16,10 @@
 import de.mpg.imeji.logic.controller.resource.AlbumController;
 import de.mpg.imeji.logic.controller.resource.CollectionController;
 import de.mpg.imeji.logic.export.format.Export;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.SearchQueryParser;
 import de.mpg.imeji.logic.search.model.SearchQuery;
 import de.mpg.imeji.logic.search.model.SearchResult;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.util.ObjectHelper;
 import de.mpg.imeji.logic.vo.Album;
 import de.mpg.imeji.logic.vo.CollectionImeji;

src/main/java/de/mpg/imeji/logic/export/format/ZIPExport.java

@@ -41,8 +41,8 @@
 
 import de.mpg.imeji.exceptions.ImejiException;
 import de.mpg.imeji.logic.Imeji;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.model.SearchResult;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.storage.StorageController;
 import de.mpg.imeji.logic.vo.Item;
 import de.mpg.imeji.logic.vo.User;

src/main/java/de/mpg/imeji/logic/controller/resource/ItemController.java → src/main/java/de/mpg/imeji/logic/item/ItemController.java

@@ -1,4 +1,4 @@
-package de.mpg.imeji.logic.controller.resource;
+package de.mpg.imeji.logic.item;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -15,7 +15,6 @@
 import de.mpg.imeji.logic.Imeji;
 import de.mpg.imeji.logic.reader.ReaderFacade;
 import de.mpg.imeji.logic.service.ImejiServiceAbstract;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.storage.Storage;
 import de.mpg.imeji.logic.util.LicenseUtil;
 import de.mpg.imeji.logic.vo.CollectionImeji;
@@ -35,8 +34,13 @@
  */
 public class ItemController extends ImejiServiceAbstract {
   private static final Logger LOGGER = Logger.getLogger(ItemService.class);
-  private static final ReaderFacade READER = new ReaderFacade(Imeji.imageModel);
-  private static final WriterFacade WRITER = new WriterFacade(Imeji.imageModel);
+  private final ReaderFacade READER;
+  private final WriterFacade WRITER;
+
+  public ItemController() {
+    READER = new ReaderFacade(Imeji.imageModel);
+    WRITER = new WriterFacade(Imeji.imageModel);
+  }
 
   /**
    * Create a {@link List} of {@link Item} in a {@link CollectionImeji}. This method is faster than

src/main/java/de/mpg/imeji/logic/service/item/ItemService.java → src/main/java/de/mpg/imeji/logic/item/ItemService.java

@@ -1,7 +1,7 @@
 /**
  * License: src/main/resources/license/escidoc.license
  */
-package de.mpg.imeji.logic.service.item;
+package de.mpg.imeji.logic.item;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
@@ -26,7 +26,6 @@
 import de.mpg.imeji.exceptions.UnprocessableError;
 import de.mpg.imeji.logic.Imeji;
 import de.mpg.imeji.logic.controller.resource.ContentController;
-import de.mpg.imeji.logic.controller.resource.ItemController;
 import de.mpg.imeji.logic.search.Search;
 import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
 import de.mpg.imeji.logic.search.elasticsearch.ElasticIndexer;
@@ -785,5 +784,4 @@ public List<Item> retrieveAll() throws ImejiException {
     LOGGER.info(uris.size() + " items found, retrieving...");
     return (List<Item>) retrieveBatch(uris, -1, 0, Imeji.adminUser);
   }
-
 }

src/main/java/de/mpg/imeji/logic/jobs/ElasticReIndexJob.java

@@ -9,11 +9,11 @@
 import de.mpg.imeji.logic.controller.resource.CollectionController;
 import de.mpg.imeji.logic.controller.resource.ContentController;
 import de.mpg.imeji.logic.controller.resource.SpaceController;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.elasticsearch.ElasticIndexer;
 import de.mpg.imeji.logic.search.elasticsearch.ElasticInitializer;
 import de.mpg.imeji.logic.search.elasticsearch.ElasticService;
 import de.mpg.imeji.logic.search.elasticsearch.ElasticService.ElasticTypes;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.user.controller.GroupBusinessController;
 import de.mpg.imeji.logic.user.controller.UserBusinessController;
 import de.mpg.imeji.logic.vo.Album;

src/main/java/de/mpg/imeji/logic/jobs/FulltextAndTechnicalMetadataJob.java

@@ -4,7 +4,7 @@
 
 import org.apache.log4j.Logger;
 
-import de.mpg.imeji.logic.service.item.ItemService;
+import de.mpg.imeji.logic.item.ItemService;
 
 /**
  * Job to extract fulltext and technical metadata for all files

src/main/java/de/mpg/imeji/logic/jobs/ImportFileFromEscidocToInternalStorageJob.java

@@ -9,7 +9,7 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.log4j.Logger;
 
-import de.mpg.imeji.logic.service.item.ItemService;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.storage.StorageController;
 import de.mpg.imeji.logic.storage.UploadResult;
 import de.mpg.imeji.logic.util.ObjectHelper;

src/main/java/de/mpg/imeji/logic/jobs/RefreshFileSizeJob.java

@@ -9,9 +9,9 @@
 
 import de.mpg.imeji.exceptions.ImejiException;
 import de.mpg.imeji.logic.Imeji;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.jenasearch.ImejiSPARQL;
 import de.mpg.imeji.logic.search.jenasearch.JenaCustomQueries;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.storage.internal.InternalStorageManager;
 import de.mpg.imeji.logic.storage.util.ImageUtils;
 import de.mpg.imeji.logic.vo.Item;

src/main/java/de/mpg/imeji/logic/service/statement/StatementController.java → src/main/java/de/mpg/imeji/logic/statement/StatementController.java

@@ -1,4 +1,4 @@
-package de.mpg.imeji.logic.service.statement;
+package de.mpg.imeji.logic.statement;
 
 import java.net.URI;
 import java.util.ArrayList;

src/main/java/de/mpg/imeji/logic/service/statement/StatementService.java → src/main/java/de/mpg/imeji/logic/statement/StatementService.java

@@ -1,4 +1,4 @@
-package de.mpg.imeji.logic.service.statement;
+package de.mpg.imeji.logic.statement;
 
 import java.util.List;
 
@@ -39,6 +39,18 @@ public Statement create(Statement statement, User user) throws ImejiException {
     return controller.create(statement, user);
   }
 
+  /**
+   * Create a list of {@link Statement}
+   * 
+   * @param statement
+   * @param user
+   * @return
+   * @throws ImejiException
+   */
+  public List<Statement> createBatch(List<Statement> l, User user) throws ImejiException {
+    return controller.createBatch(l, user);
+  }
+
   /**
    * Retrieve a {@link Statement}
    * 
@@ -101,7 +113,8 @@ public List<Statement> retrieve(List<String> ids, User user) throws ImejiExcepti
 
   @Override
   public List<Statement> retrieveAll() throws ImejiException {
-    List<String> uris = ImejiSPARQL.exec(JenaCustomQueries.selectItemAll(), Imeji.statementModel);
+    List<String> uris =
+        ImejiSPARQL.exec(JenaCustomQueries.selectStatementAll(), Imeji.statementModel);
     return (List<Statement>) retrieveBatch(uris, Imeji.adminUser);
   }
 }

src/main/java/de/mpg/imeji/logic/storage/internal/InternalStorageManager.java

@@ -161,8 +161,7 @@ public void removeFile(String url) {
     if (f.exists()) {
       boolean deleted = FileUtils.deleteQuietly(f);
       if (!deleted) {
-        throw new RuntimeException(
-            "Impossible to delete the existing file. Please close all Digilib pages and try later.");
+        throw new RuntimeException("Impossible to delete the existing file.");
       }
     }
   }

src/main/java/de/mpg/imeji/logic/vo/Statement.java

@@ -33,11 +33,12 @@
 public class Statement implements Serializable, Cloneable {
   private static final long serialVersionUID = -7950561563075491540L;
   private String id;
+  private StatementType type = StatementType.TEXT;
   private URI uri;
   @j2jLiteral("http://imeji.org/terms/index")
   private String index;
   @j2jLiteral("http://purl.org/dc/terms/type")
-  private StatementType type = StatementType.TEXT;
+  private String typeString = type.name();
   @j2jList("http://purl.org/dc/terms/name")
   private List<String> names = new ArrayList<>();
   @j2jResource("http://purl.org/dc/dcam/VocabularyEncodingScheme")
@@ -51,11 +52,13 @@ public Statement() {
   }
 
   public StatementType getType() {
+    type = StatementType.valueOf(typeString);
     return type;
   }
 
   public void setType(StatementType type) {
     this.type = type;
+    this.typeString = type.name();
   }
 
   /**
@@ -154,8 +157,6 @@ public Statement clone() {
     return clone;
   }
 
-
-
   /**
    * Comparator to sort String ignoring the case
    *

src/main/java/de/mpg/imeji/logic/vo/StatementType.java

@@ -8,5 +8,4 @@
  */
 public enum StatementType {
   TEXT, NUMBER, GEOLOCATION, DATE, PERSON, URL;
-
 }

src/main/java/de/mpg/imeji/presentation/album/AlbumBean.java

@@ -19,7 +19,7 @@
 import de.mpg.imeji.exceptions.ImejiException;
 import de.mpg.imeji.logic.Imeji;
 import de.mpg.imeji.logic.controller.resource.AlbumController;
-import de.mpg.imeji.logic.service.item.ItemService;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.user.controller.UserBusinessController;
 import de.mpg.imeji.logic.util.ObjectHelper;
 import de.mpg.imeji.logic.util.UrlHelper;

src/main/java/de/mpg/imeji/presentation/album/AlbumItemsBean.java

@@ -16,10 +16,10 @@
 import de.mpg.imeji.exceptions.ImejiException;
 import de.mpg.imeji.logic.Imeji;
 import de.mpg.imeji.logic.controller.resource.AlbumController;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.model.SearchQuery;
 import de.mpg.imeji.logic.search.model.SearchResult;
 import de.mpg.imeji.logic.search.model.SortCriterion;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.util.ObjectHelper;
 import de.mpg.imeji.logic.util.UrlHelper;
 import de.mpg.imeji.logic.vo.Album;

src/main/java/de/mpg/imeji/presentation/beans/ContainerBean.java

@@ -35,8 +35,8 @@
 import de.mpg.imeji.exceptions.UnprocessableError;
 import de.mpg.imeji.logic.Imeji;
 import de.mpg.imeji.logic.doi.DoiService;
+import de.mpg.imeji.logic.item.ItemService;
 import de.mpg.imeji.logic.search.model.SearchIndex.SearchFields;
-import de.mpg.imeji.logic.service.item.ItemService;
 import de.mpg.imeji.logic.search.model.SearchOperators;
 import de.mpg.imeji.logic.search.model.SearchPair;
 import de.mpg.imeji.logic.search.model.SearchQuery;

src/main/java/de/mpg/imeji/presentation/beans/MetadataLabels.java

@@ -14,7 +14,7 @@
 
 import de.mpg.imeji.exceptions.ImejiException;
 import de.mpg.imeji.logic.Imeji;
-import de.mpg.imeji.logic.service.statement.StatementService;
+import de.mpg.imeji.logic.statement.StatementService;
 import de.mpg.imeji.logic.vo.Item;
 import de.mpg.imeji.logic.vo.Statement;