Changeset 859

Timestamp:

11/08/10 16:08:20 (14 years ago)

Author:

oschonef

Message:

• add 'address', 'telephone', 'website' and 'role' fields to creator
• rename creator 'name' field to 'person' to match CMDI contact

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshaller.java (modified) (6 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualColletionRegistryOAIRepository.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditCreatorDialog$Content.html (modified) (1 diff)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditCreatorDialog.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Creator.java (modified) (8 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/query/ASTPredicate.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/query/WhereClauseBuilder.java (modified) (1 diff)
• main/jjtree/eu/clarin/cmdi/virtualcollectionregistry/query/QueryParser.jjt (modified) (2 diffs)
• main/resources/META-INF/VirtualCollection.xsd (modified) (1 diff)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshallerTest.java (modified) (2 diffs)
• test/resources/VirtualCollection-extensional.xml (modified) (1 diff)
• test/resources/VirtualCollection-intensional.xml (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshaller.java

@@ -263 +263 @@
                 writer.writeStartElement("Creator");
 
-                writer.writeStartElement("Name");
-                writer.writeCharacters(creator.getName());
-                writer.writeEndElement(); // "Name" element
+                writer.writeStartElement("Person");
+                writer.writeCharacters(creator.getPerson());
+                writer.writeEndElement(); // "Person" element
+
+                if (creator.getAddress() != null) {
+                    writer.writeStartElement("Address");
+                    writer.writeCharacters(creator.getAddress());
+                    writer.writeEndElement(); // "Address" element
+                }
 
                 if (creator.getEMail() != null) {
@@ -277 +283 @@
                     writer.writeCharacters(creator.getOrganisation());
                     writer.writeEndElement(); // "Organisation" element
+                }
+
+                if (creator.getTelephone() != null) {
+                    writer.writeStartElement("Telephone");
+                    writer.writeCharacters(creator.getTelephone());
+                    writer.writeEndElement(); // "Telephone" element
+                }
+
+                if (creator.getWebsite() != null) {
+                    writer.writeStartElement("Website");
+                    writer.writeCharacters(creator.getWebsite());
+                    writer.writeEndElement(); // "Website" element
+                }
+
+                if (creator.getRole() != null) {
+                    writer.writeStartElement("Role");
+                    writer.writeCharacters(creator.getRole());
+                    writer.writeEndElement(); // "Role" element
                 }
 
@@ -445 +469 @@
             readStart(reader, "Creator", true, true);
             do {
-                readStart(reader, "Name", true, true);
+                readStart(reader, "Person", true, true);
                 Creator creator = new Creator(readString(reader, false));
+                if (readStart(reader, "Address", false, true)) {
+                    creator.setAddress(readString(reader, false));
+                }
                 if (readStart(reader, "Email", false, true)) {
                     creator.setEMail(readString(reader, false));
@@ -452 +479 @@
                 if (readStart(reader, "Organisation", false, true)) {
                     creator.setOrganisation(readString(reader, false));
+                }
+                if (readStart(reader, "Telephone", false, true)) {
+                    creator.setTelephone(readString(reader, false));
+                }
+                if (readStart(reader, "Website", false, true)) {
+                    creator.setWebsite(readString(reader, false));
+                }
+                if (readStart(reader, "Role", false, true)) {
+                    creator.setRole(readString(reader, false));
                 }
                 vc.getCreators().add(creator);
@@ -643 +679 @@
             for (Creator creator : vc.getCreators()) {
                 // make sure there is anything set in creator
-                if ((creator.getName() != null) ||
+                if ((creator.getPerson() != null) ||
                         (creator.getEMail() != null) ||
                         (creator.getOrganisation() != null)) {
                     out.writeStartElement(NS_CMDI, "Creator");
-                    if (creator.getName() != null) {
-                        out.writeStartElement(NS_CMDI, "Name");
-                        out.writeCharacters(creator.getName());
-                        out.writeEndElement(); // "Name" element
+                    if (creator.getPerson() != null) {
+                        out.writeStartElement(NS_CMDI, "Person");
+                        out.writeCharacters(creator.getPerson());
+                        out.writeEndElement(); // "Person" element
+                    }
+                    if (creator.getAddress() != null) {
+                        out.writeStartElement(NS_CMDI, "Address");
+                        out.writeCharacters(creator.getAddress());
+                        out.writeEndElement(); // "Address" element
                     }
                     if (creator.getEMail() != null) {
@@ -661 +702 @@
                         out.writeCharacters(creator.getOrganisation());
                         out.writeEndElement(); // "Organisation" element
+                    }
+                    if (creator.getTelephone() != null) {
+                        out.writeStartElement(NS_CMDI, "Telephone");
+                        out.writeCharacters(creator.getTelephone());
+                        out.writeEndElement(); // "Telephone" element
+                    }
+                    if (creator.getWebsite() != null) {
+                        out.writeStartElement(NS_CMDI, "Website");
+                        out.writeCharacters(creator.getWebsite());
+                        out.writeEndElement(); // "Website" element
+                    }
+                    if (creator.getRole() != null) {
+                        out.writeStartElement(NS_CMDI, "Role");
+                        out.writeCharacters(creator.getRole());
+                        out.writeEndElement(); // "Role" element
                     }
                     out.writeEndElement(); // "Creator" element

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualColletionRegistryOAIRepository.java

@@ -178 +178 @@
                     List<String> creators = new ArrayList<String>();
                     for (Creator creator : vc.getCreators()) {
-                        creators.add(creator.getName());
+                        creators.add(creator.getPerson());
                     }
                 }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java

@@ -311 +311 @@
         private IColumn<Creator>[] createColumns() {
             final IColumn<?>[] columns = new IColumn<?>[] {
-                    new PropertyColumn<Creator>(new Model<String>("Name"),
-                            "name"),
+                    new PropertyColumn<Creator>(new Model<String>("Person"),
+                            "person"),
                     new PropertyColumn<Creator>(new Model<String>("EMail"),
                             "email"),
@@ -625 +625 @@
         }
         for (Creator c : vc.getCreators()) {
-            System.err.println("C: " + c.getName() + ", " + c.getEMail());
+            System.err.println("C: " + c.getPerson() + ", " + c.getEMail());
         }
         for (Resource r : vc.getResources()) {

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditCreatorDialog$Content.html

@@ -10 +10 @@
   <fieldset>
     <div class="required">
-      <label for="edit_creator_name">Name</label>
-      <input wicket:id="name" id="edit_creator_name" type="text" />
+      <label for="edit_creator_person">Person</label>
+      <input wicket:id="person"
+             id="edit_creator_person" type="text" size="32" maxlength="255" />
+    </div>
+    <div class="optional">
+      <label for="edit_creator_address">Address</label>
+      <textarea wicket:id="address"
+              id="edit_creator_address" rows="4" cols="24"></textarea>
     </div>
     <div class="optional">
       <label for="edit_creator_email">E-Mail</label>
-      <input wicket:id="email" id="edit_creator_email" type="text" />
+      <input wicket:id="email"
+             id="edit_creator_email" type="text"  size="32" maxlength="255" />
     </div>
     <div class="optional">
       <label for="edit_creator_org">Organisation</label>
-      <input wicket:id="organisation" id="edit_creator_org" type="text" />
+      <input wicket:id="organisation"
+             id="edit_creator_org" type="text" size="32" maxlength="255" />
+    </div>
+    <div class="optional">
+      <label for="edit_creator_telephone">Telephone</label>
+      <input wicket:id="telephone"Ž
+             id="edit_creator_telephone" type="text" size="32" maxlength="255" />
+    </div>
+    <div class="optional">
+      <label for="edit_creator_website">Website</label>
+      <input wicket:id="website"
+             id="edit_creator_website" type="text" size="32" maxlength="255" />
+    </div>
+    <div class="optional">
+      <label for="edit_creator_role">Role</label>
+      <input wicket:id="role"
+             id="edit_creator_role" type="text" size="32" maxlength="255" />
     </div>
   </fieldset>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditCreatorDialog.java

@@ -3 +3 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -10 +11 @@
 import org.apache.wicket.validation.validator.EmailAddressValidator;
 import org.apache.wicket.validation.validator.StringValidator;
+import org.apache.wicket.validation.validator.UrlValidator;
 
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ModalEditDialogBase;
@@ -24 +26 @@
             super(id);
             form = new Form<Creator>("editCreatorForm", model);
-            final TextField<String> nameField =
-                new RequiredTextField<String>("name");
-            nameField.add(new StringValidator.MaximumLengthValidator(255));
-            form.add(nameField);
+            final TextField<String> personField =
+                new RequiredTextField<String>("person");
+            personField.add(new StringValidator.MaximumLengthValidator(255));
+            form.add(personField);
+            final TextArea<String> addressArea =
+                new TextArea<String>("address");
+            addressArea.add(new StringValidator.MaximumLengthValidator(255));
+            form.add(addressArea);
             final TextField<String> emailField =
                 new TextField<String>("email");
@@ -38 +44 @@
                     new StringValidator.MaximumLengthValidator(255));
             form.add(organisationField);
+            final TextField<String> telephoneField =
+                new TextField<String>("telephone");
+            telephoneField.add(new StringValidator.MaximumLengthValidator(255));
+            form.add(telephoneField);
+            final TextField<String> websiteField =
+                new TextField<String>("website");
+            websiteField.add(new StringValidator.MaximumLengthValidator(255));
+            websiteField.add(new UrlValidator());
+            form.add(websiteField);
+            final TextField<String> roleField =
+                new TextField<String>("role");
+            roleField.add(new StringValidator.MaximumLengthValidator(255));
+            form.add(roleField);
             feedbackPanel = new FeedbackPanel("feedback");
             form.add(feedbackPanel);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Creator.java

@@ -23 +23 @@
     private Long id;
     
-    @Column(name = "name", nullable = false)
-    private String name;
+    @Column(name = "person", nullable = false)
+    private String person;
 
+    @Column(name = "address")
+    private String address;
+    
     @Column(name = "email")
     private String email;
@@ -32 +35 @@
     private String organisation;
 
+    @Column(name = "telephone")
+    private String telephone;
+
+    @Column(name = "website")
+    private String website;
+
+    @Column(name = "role")
+    private String role;
     
     public Creator() {
@@ -37 +48 @@
     }
 
-    public Creator(String name, String email, String organisation) {
+    public Creator(String person) {
         super();
-        this.setName(name);
-        this.setEMail(email);
-        this.setOrganisation(organisation);
-    }
-    
-    public Creator(String name) {
-        this(name, null, null);
+        this.setPerson(person);
     }
 
@@ -52 +57 @@
     }
 
-    public String getName() {
-        return name;
+    public String getPerson() {
+        return person;
     }
 
-    public void setName(String value) {
-        this.name = value;
+    public void setPerson(String person) {
+        this.person = person;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+    
+    public void setAddress(String address) {
+        this.address = address;
     }
 
@@ -64 +77 @@
     }
 
-    public void setEMail(String value) {
-        this.email = value;
+    public void setEMail(String email) {
+        this.email = email;
     }
 
@@ -72 +85 @@
     }
 
-    public void setOrganisation(String value) {
-        this.organisation = value;
+    public void setOrganisation(String organisation) {
+        this.organisation = organisation;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+    
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+    
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
     }
 
@@ -87 +124 @@
             final Creator rhs = (Creator) obj;
             return new EqualsBuilder()
-                .append(this.getName(), rhs.getName())
+                .append(this.getPerson(), rhs.getPerson())
+                .append(this.getAddress(), rhs.getAddress())
                 .append(this.getEMail(), rhs.getEMail())
                 .append(this.getOrganisation(), rhs.getOrganisation())
+                .append(this.getTelephone(), rhs.getTelephone())
+                .append(this.getWebsite(), rhs.getWebsite())
+                .append(this.getRole(), rhs.getRole())
                 .isEquals();
         }
@@ -98 +139 @@
     public int hashCode() {
         return new HashCodeBuilder(32361, 7611)
-            .append(this.getName())
+            .append(this.getPerson())
+            .append(this.getAddress())
             .append(this.getEMail())
             .append(this.getOrganisation())
+            .append(this.getTelephone())
+            .append(this.getWebsite())
+            .append(this.getRole())
             .toHashCode();
     }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/query/ASTPredicate.java

@@ -70 +70 @@
             sb.append("vc_owner");
             break;
-        case QueryParserConstants.CR_NAME:
+        case QueryParserConstants.CR_PERSON:
             sb.append("cr_name");
             break;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/query/WhereClauseBuilder.java

@@ -132 +132 @@
                     node.getOperator(), node.getValue());
             break;
-        case QueryParserConstants.CR_NAME:
-            predicate = makeStringPredicate(data,
-                    root.join(VirtualCollection_.creators).get(Creator_.name),
+        case QueryParserConstants.CR_PERSON:
+            predicate = makeStringPredicate(data,
+                    root.join(VirtualCollection_.creators).get(Creator_.person),
                     node.getOperator(), node.getValue());
             break;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/jjtree/eu/clarin/cmdi/virtualcollectionregistry/query/QueryParser.jjt

@@ -44 +44 @@
     | <VC_REPRODUCIBILITY: "reproducibility">
     | <VC_OWNER: "owner">
-    | <CR_NAME: "creator">
+    | <CR_PERSON: "person">
     | <CR_ORGANIZATION: "organization">
     | <CR_EMAIL: "email">
@@ -108 +108 @@
        | attribute = <VC_DESC>
        | attribute = <VC_OWNER>
-       | attribute = <CR_NAME>
+       | attribute = <CR_PERSON>
        | attribute = <CR_ORGANIZATION>
        | attribute = <CR_EMAIL> )

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/META-INF/VirtualCollection.xsd

@@ -41 +41 @@
                 <xs:complexType>
                     <xs:sequence>
-                      <xs:element name="Name" type="xs:string"/>
+                      <xs:element name="Person" type="xs:string"/>
+                      <xs:element name="Address" type="xs:string" minOccurs="0"/>
                       <xs:element name="Email" type="xs:string" minOccurs="0"/>
                       <xs:element name="Organisation" type="xs:string" minOccurs="0"/>
+                      <xs:element name="Telephone" type="xs:string" minOccurs="0" />
+                      <xs:element name="Website" type="xs:anyURI" minOccurs="0" />
+                      <xs:element name="Role" type="xs:string" minOccurs="0" />
                     </xs:sequence>
                 </xs:complexType>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/test/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshallerTest.java

@@ -70 +70 @@
         Creator c = vc.getCreators().get(0);
         assertNotNull(c);
-        assertEquals("Joe User", c.getName());
+        assertEquals("Joe User", c.getPerson());
+        assertEquals("Example Address Joe", c.getAddress());
         assertEquals("joe.user@example.com", c.getEMail());
         assertEquals("Example Organization", c.getOrganisation());
+        assertEquals("+1-800-555-0101", c.getTelephone());
+        assertEquals("http://www.example.org/~joe/", c.getWebsite());
+        assertEquals("Test Role Joe", c.getRole());
         c = vc.getCreators().get(1);
         assertNotNull(c);
-        assertEquals("Jane User", c.getName());
+        assertEquals("Jane User", c.getPerson());
+        assertEquals("Example Address Jane", c.getAddress());
         assertEquals("jane.user@example.com", c.getEMail());
         assertEquals("Example Organization", c.getOrganisation());
+        assertEquals("+1-800-555-0102", c.getTelephone());
+        assertEquals("http://www.example.org/~jane/", c.getWebsite());
+        assertEquals("Test Role Jane", c.getRole());
 
         assertNotNull(vc.getResources());
@@ -155 +163 @@
         Creator c = vc.getCreators().get(0);
         assertNotNull(c);
-        assertEquals("Joe User", c.getName());
+        assertEquals("Joe User", c.getPerson());
         assertEquals("joe.user@example.com", c.getEMail());
         assertEquals("Example Organization", c.getOrganisation());

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/test/resources/VirtualCollection-extensional.xml

@@ -8 +8 @@
     <Creators>
         <Creator>
-            <Name>Joe User</Name>
+            <Person>Joe User</Person>
+            <Address>Example Address Joe</Address>
             <Email>joe.user@example.com</Email>
             <Organisation>Example Organization</Organisation>
+            <Telephone>+1-800-555-0101</Telephone>
+            <Website>http://www.example.org/~joe/</Website>
+            <Role>Test Role Joe</Role>
         </Creator>
         <Creator>
-            <Name>Jane User</Name>
+            <Person>Jane User</Person>
+            <Address>Example Address Jane</Address>
             <Email>jane.user@example.com</Email>
             <Organisation>Example Organization</Organisation>
+            <Telephone>+1-800-555-0102</Telephone>
+            <Website>http://www.example.org/~jane/</Website>
+            <Role>Test Role Jane</Role>
         </Creator>
     </Creators>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/test/resources/VirtualCollection-intensional.xml

@@ -8 +8 @@
     <Creators>
         <Creator>
-            <Name>Joe User</Name>
+            <Person>Joe User</Person>
             <Email>joe.user@example.com</Email>
             <Organisation>Example Organization</Organisation>