- fixed resumption token generation for oai-pmh import

- relaxed dublin core parsing: the dc:reference tag may replace dc:identifier if this does not contain a valid url
- parsing of completeRecords number and presentation in the download list of oai import

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6850 6c8d7289-2bf4-0310-a012-ef5d649a1542

3 files changed, 4 insertions, 1 deletions

diff --git a/htroot/IndexImportOAIPMHList_p.html b/htroot/IndexImportOAIPMHList_p.html
index 168a1f85d..2b2e78440 100644
--- a/htroot/IndexImportOAIPMHList_p.html
+++ b/htroot/IndexImportOAIPMHList_p.html
@@ -57,6 +57,7 @@
         <td>Source</td>

         <td>Processed<br />Chunks</td>

         <td>Imported<br />Records</td>

+        <td>Complete at<br /># Records</td>

         <td>Speed<br />(records/second)</td>

       </tr>

       #{table}#

@@ -65,6 +66,7 @@
         <td>#[source]#</td>

         <td>#[chunkCount]#</td>

         <td>#[recordsCount]#</td>

+        <td>#[completeListSize]#</td>

         <td>#[speed]#</td>

       </tr>

       #{/table}#

diff --git a/htroot/IndexImportOAIPMHList_p.java b/htroot/IndexImportOAIPMHList_p.java
index ceba573a2..4fb79abda 100644
--- a/htroot/IndexImportOAIPMHList_p.java
+++ b/htroot/IndexImportOAIPMHList_p.java
@@ -75,6 +75,7 @@ public class IndexImportOAIPMHList_p {
                 prop.put("import_table_" + count + "_source", job.source());

                 prop.put("import_table_" + count + "_chunkCount", job.chunkCount());

                 prop.put("import_table_" + count + "_recordsCount", job.count());

+                prop.put("import_table_" + count + "_completeListSize", job.getCompleteListSize());

                 prop.put("import_table_" + count + "_speed", job.speed());

                 dark = !dark;

                 count++;

diff --git a/htroot/IndexImportOAIPMH_p.java b/htroot/IndexImportOAIPMH_p.java
index dc6985979..300896331 100644
--- a/htroot/IndexImportOAIPMH_p.java
+++ b/htroot/IndexImportOAIPMH_p.java
@@ -68,7 +68,7 @@ public class IndexImportOAIPMH_p {
                     

                     // set next default url

                     try {

-                        DigestURI nexturl = (rt == null) ? null : rt.resumptionURL(url);

+                        DigestURI nexturl = (rt == null) ? null : rt.resumptionURL();

                         if (rt != null) prop.put("defaulturl", (nexturl == null) ? "" : nexturl.toNormalform(true, false));

                     } catch (MalformedURLException e) {

                         prop.put("defaulturl", e.getMessage());