Mercurial > hg > eSciDocImport

changeset 9:b6cf6462d709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small changes
author dwinter
date Thu, 21 Jun 2012 09:46:26 +0200
parents a844f6948dd8
children ad5c0748bd08 ecd66e70cb65
files .classpath src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java src/de/mpiwg/itgroup/eSciDoc/echoObjects/ECHORessource.java src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java src/de/mpiwg/itgroup/eSciDoc/foxridge/IndexMetaIterator.java src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java
diffstat 7 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Mon May 14 09:58:45 2012 +0200
+++ b/.classpath	Thu Jun 21 09:46:26 2012 +0200
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="libs/jdom-1.0.jar" sourcepath="/Users/dwinter/.m2/repository/jdom/jdom/1.0/jdom-1.0-sources.jar"/>
-	<classpathentry kind="lib" path="libs/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="libs/jaxen-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jdom-1.0.jar" sourcepath="/Users/dwinter/.m2/repository/jdom/jdom/1.0/jdom-1.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/log4j-1.2.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/>
 	<classpathentry kind="lib" path="libs/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="libs/commons-logging-1.1.jar"/>
 	<classpathentry kind="lib" path="libs/junit-4.6.jar"/>
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java	Thu Jun 21 09:46:26 2012 +0200
@@ -42,7 +42,7 @@
 		}
 		try {
 			//ret = handler.eScidocDelete(args[0]);
-			ret = handler.eScidocPost(args[0], url);
+			ret = handler.eScidocPut(args[0], url);
 		} catch (ClientProtocolException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
--- a/src/de/mpiwg/itgroup/eSciDoc/echoObjects/ECHORessource.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/echoObjects/ECHORessource.java	Thu Jun 21 09:46:26 2012 +0200
@@ -73,7 +73,8 @@
 	
 	public ECHORessource(String name, String archivePath, String echoUrl) throws IOException {
 		this();
-		CMM ="/cmm/content-model/escidoc:11003";
+		//CMM ="/cmm/content-model/escidoc:11003";
+		CMM ="/cmm/content-model/escidoc:131281";
 		this.name = name;
 		this.archivePath = archivePath;
 		this.echoUrl = echoUrl;
@@ -274,7 +275,7 @@
 		
 	}
 	public void writeEsciDocIDToIndexMeta(String objid) {
-		String driType="escidoc-test";
+		String driType="escidoc";
 		String txt;
 		Element result;
 		try {
--- a/src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java	Thu Jun 21 09:46:26 2012 +0200
@@ -12,14 +12,14 @@
 	
 	public FoxridgeRessource() throws IOException {
 		super();
-		CMM ="/cmm/content-model/escidoc:13001";
+		CMM ="/cmm/content-model/escidoc:131281";
 		
 		// TODO Auto-generated constructor stub
 	}
 
 	public FoxridgeRessource(String name, String absolutePath, String string) throws IOException {
 		super(name, absolutePath, string);
-		CMM ="/cmm/content-model/escidoc:13001";
+		CMM ="/cmm/content-model/escidoc:131281";
 	}
 
 }
--- a/src/de/mpiwg/itgroup/eSciDoc/foxridge/IndexMetaIterator.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/foxridge/IndexMetaIterator.java	Thu Jun 21 09:46:26 2012 +0200
@@ -84,7 +84,8 @@
 			System.out.println("CHECK_________"+nextFile);
 			
 		
-			if(!nextFile.equals("pageimg")){ //skip pageimg
+			if(!nextFile.endsWith("pageimg") & !nextFile.endsWith("pages") & !nextFile.endsWith("pagesHi") & !nextFile.endsWith("pagesLo") 
+					& !nextFile.endsWith("pageimg")){ //skip pageimg
 				
 				File nf = new File(nextFile);
 				
--- a/src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java	Thu Jun 21 09:46:26 2012 +0200
@@ -424,7 +424,7 @@
 		rl.setLevel(Level.DEBUG);
 
 
-		EScidocBasicHandler connector = new EScidocBasicHandler("escidoc-test.mpiwg-berlin.mpg.de",8080,"dwinter","weikiki7");
+		EScidocBasicHandler connector = new EScidocBasicHandler("escidoc.mpiwg-berlin.mpg.de",8080,"dwinter","weikiki7");
 
 
 		//ECHOImporter newimporter = new ECHOImporter(new URL(
--- a/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java	Mon May 14 09:58:45 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java	Thu Jun 21 09:46:26 2012 +0200
@@ -48,7 +48,7 @@
         //while (sd.hasNext()){
         //	System.out.println(sd.next());
         //}
-		EScidocBasicHandler connector = new EScidocBasicHandler("escidoc-test.mpiwg-berlin.mpg.de",8080,username,pw);
+		EScidocBasicHandler connector = new EScidocBasicHandler("escidoc.mpiwg-berlin.mpg.de",8080,username,pw);
 		
 		//ESciDocDataHarvester hv = new ESciDocDataHarvester(new FoxridgeImporter(new File("/Volumes/online_permanent/")),
 		//		new ECHOTransformer(),connector,"/ir/context/escidoc:12001");