X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2FArtifactIndexer.java;h=f62142254bb6a27e7d9cc429804d03fe6ba2ad44;hb=d5b315ae97d554676a77bd0e4476446da2a78264;hp=a0f0be25ba2ca4ed4efb65932c410cff02c778e3;hpb=aeaa45c7cfbb4f2376a4ec02e6dd71d711a52c5b;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
index a0f0be25b..f62142254 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import org.sonatype.aether.artifact.Artifact;
  */
 public class ArtifactIndexer implements NodeIndexer {
 	private Log log = LogFactory.getLog(ArtifactIndexer.class);
+	private Boolean force = false;
 
 	public Boolean support(String path) {
 		String relativePath = getRelativePath(path);
@@ -52,6 +53,13 @@ public class ArtifactIndexer implements NodeIndexer {
 	public void index(Node fileNode) {
 		Artifact artifact = null;
 		try {
+			if (!support(fileNode.getPath()))
+				return;
+
+			// Already indexed
+			if (!force && fileNode.isNodeType(SlcTypes.SLC_ARTIFACT))
+				return;
+
 			if (!fileNode.isNodeType(NodeType.NT_FILE))
 				return;
 
@@ -73,13 +81,19 @@ public class ArtifactIndexer implements NodeIndexer {
 					artifact.getClassifier());
 			JcrUtils.updateLastModified(fileNode);
 
-			// make sure there is a checksum
+			// make sure there are checksums
 			String shaNodeName = fileNode.getName() + ".sha1";
 			if (!fileNode.getParent().hasNode(shaNodeName)) {
 				String sha = JcrUtils.checksumFile(fileNode, "SHA-1");
 				JcrUtils.copyBytesAsFile(fileNode.getParent(), shaNodeName,
 						sha.getBytes());
 			}
+			String md5NodeName = fileNode.getName() + ".md5";
+			if (!fileNode.getParent().hasNode(md5NodeName)) {
+				String md5 = JcrUtils.checksumFile(fileNode, "MD5");
+				JcrUtils.copyBytesAsFile(fileNode.getParent(), md5NodeName,
+						md5.getBytes());
+			}
 
 			// set higher levels
 			Node artifactVersionBase = fileNode.getParent();
@@ -139,4 +153,9 @@ public class ArtifactIndexer implements NodeIndexer {
 		String relativePath = nodePath.substring(basePath.length());
 		return relativePath;
 	}
+
+	public void setForce(Boolean force) {
+		this.force = force;
+	}
+
 }