From 42bb55b0c9e4155c31819318e0dde31f55551337 Mon Sep 17 00:00:00 2001
From: mbrodhu <brodhun@sub.uni-goettingen.de>
Date: Wed, 27 Jan 2016 12:51:22 +0100
Subject: [PATCH] sets identified by project id
---
oaipmh-core/pom.xml | 4 ++--
.../java/info/textgrid/middleware/RecordListDeliverer.java | 2 +-
.../src/main/java/info/textgrid/middleware/SetDeliverer.java | 4 ++--
.../src/test/java/info/textgrid/middleware/OaiPmhTest.java | 4 ++--
oaipmh-webapp/pom.xml | 4 ++--
pom.xml | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 76edfcb5..ac4cfb5e 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.3.22-SNAPSHOT</version>
+ <version>1.3.23-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
- <version>1.3.22-SNAPSHOT</version>
+ <version>1.3.23-SNAPSHOT</version>
<packaging>jar</packaging>
<name>TextGrid :: TG-OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
index 936821b2..7f82b055 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
@@ -351,7 +351,7 @@ public class RecordListDeliverer {
if (setParts[0].equals("project")) {
System.out.println("Testitest4");
- queryField = "project.value";
+ queryField = "project.id";
valueField = setParts[1];
System.out.println("Testitest4 " + valueField);
// setParts[0] = setParts[0].concat(".value");
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index e931befc..d37ff634 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -81,8 +81,8 @@ public class SetDeliverer {
String projectName = projectValues[0];
String projectID = projectValues[1];
- set.setSetName("project:" + projectName);
- set.setSetSpec(projectID);
+ set.setSetName(projectName);
+ set.setSetSpec("project:" + projectID);
setList.getSet().add(set);
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index 3efe011b..77c35d67 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -285,7 +285,7 @@ public class OaiPmhTest {
* @throws ParseException
*/
@Test
- @Ignore
+ //@Ignore
public void testListRecordSets() throws ParseException {
this.recordList.setContributor(TGConstants.CONTRIBUTOR_LIST);
this.recordList.setCoverage(TGConstants.COVERAGE_LIST);
@@ -311,7 +311,7 @@ public class OaiPmhTest {
this.recordList.setFieldForRange(TGConstants.CREATED);
System.out.println("Test for the verb \"ListRecord\" with sets with succesfull response");
- JAXBElement<OAIPMHType> p = this.request.getRequest("ListRecords", "","oai_dc", "project:Digitale Bibliothek", "", "", "");
+ JAXBElement<OAIPMHType> p = this.request.getRequest("ListRecords", "","oai_dc", "project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c", "", "", "");
JAXB.marshal(p, System.out);
System.out.println("-----------------------------------\n");
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 82628388..ed974a1c 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -4,12 +4,12 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.3.22-SNAPSHOT</version>
+ <version>1.3.23-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
<packaging>war</packaging>
- <version>1.3.22-SNAPSHOT</version>
+ <version>1.3.23-SNAPSHOT</version>
<name>TextGrid :: OAI-PMH :: Webapp</name>
<url>http://maven.apache.org</url>
<profiles>
diff --git a/pom.xml b/pom.xml
index 0819a8d8..8d1e8c4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>1.3.22-SNAPSHOT</version>
+ <version>1.3.23-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TextGrid :: TG-OAI-PMH :: Parent</name>
<properties>
--
GitLab