Skip to content

Make Production Place repeatable and facetable, make Series repeatable #7810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
philippconzett wants to merge 12 commits into from
Closed

Make Production Place repeatable and facetable, make Series repeatable #7810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
11a3e94
Merge pull request #1 from IQSS/develop
philippconzett Apr 16, 2021
d8ffe4c
Update citation.tsv
philippconzett Apr 19, 2021
f3334f5
Update citation.tsv
philippconzett Apr 19, 2021
8c21211
Merge branch 'IQSS:develop' into develop
philippconzett Jul 24, 2021
7f61654
Merge branch 'develop' into pr/7810
djbrooke Nov 5, 2021
6060d5f
adding release note
djbrooke Nov 5, 2021
35ff4a5
Merge branch 'develop' into pr/7810
djbrooke Nov 5, 2021
badf7d6
fixing error and rerunning tests
djbrooke Nov 5, 2021
83e8cef
Merge branch 'develop' into pr/7810
djbrooke Nov 17, 2021
d83ba71
update release note
djbrooke Nov 17, 2021
5c8ff66
updating release note, updating schema
djbrooke Nov 18, 2021
4509dea
update schema.xml from API output #7810
pdurbin Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conf/solr/8.8.1/schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
<field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="productionPlace" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="productionPlace" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
Expand All @@ -359,9 +359,9 @@
<field name="responseRate" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="samplingErrorEstimates" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="samplingProcedure" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="series" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="seriesInformation" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="seriesName" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="series" type="text_en" multiValued="true" stored="true" indexed="true"/>
Copy link
Member

@pdurbin pdurbin Nov 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want the subfields of "series" to be multivalued as well. Please check out this diff:

-    <field name="series" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesInformation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesName" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="series" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="seriesInformation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="seriesName" type="text_en" multiValued="true" stored="true" indexed="true"/>

Copy link
Member

@pdurbin pdurbin Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the subfields of series in 4509dea.

Copy link
Contributor Author

@philippconzett philippconzett Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or wouldn't it make more sense to change Series to a complex field, such as Author? I guess this would mean:

series
allowmultiples: TRUE

seriesName
allowmultiples: FALSE

seriesInformation
allowmultiples: FALSE

<field name="seriesInformation" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="seriesName" type="text_en" multiValued="true" stored="true" indexed="true"/>
<field name="socialScienceNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="socialScienceNotesSubject" type="text_en" multiValued="false" stored="true" indexed="true"/>
<field name="socialScienceNotesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
Expand Down
33 changes: 33 additions & 0 deletions doc/release-notes/7810-prod-place-and-series.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
## Upgrade Instructions

X\. Reload Citation Metadata Block:

`wget https://github.com/IQSS/dataverse/releases/download/v5.X/citation.tsv`
`curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"`

X\. Update Solr schema.xml.

`/usr/local/solr/solr-8.8.1/server/solr/collection1/conf` is used in the examples below as the location of your Solr schema. Please adapt it to the correct location, if different in your installation. Use `find / -name schema.xml` if in doubt.

Xa\. Replace `schema.xml` with the base version included in this release.

```
wget https://github.com/IQSS/dataverse/releases/download/v5.X/schema.xml
cp schema.xml /usr/local/solr/solr-8.8.1/server/solr/collection1/conf
```

For installations that are not using any Custom Metadata Blocks, **you can skip the next step**.

Xb\. For installations with Custom Metadata Blocks

Use the script provided in the release to add the custom fields to the base `schema.xml` installed in the previous step.

```
wget https://github.com/IQSS/dataverse/releases/download/v5.X/update-fields.sh
chmod +x update-fields.sh
curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-8.8.1/server/solr/collection1/conf/schema.xml
```

(Note that the curl command above calls the admin api on `localhost` to obtain the list of the custom fields. In the unlikely case that you are running the main Dataverse Application and Solr on different servers, generate the `schema.xml` on the application node, then copy it onto the Solr server)

X\. Run a ['Reindex in Place'](https://guides.dataverse.org/en/5.X/admin/solr-search-index.html#reindex-in-place) as described in the Dataverse Guides.
4 changes: 2 additions & 2 deletions scripts/api/data/metadatablocks/citation.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
producerURL URL Producer URL points to the producer's web presence, if appropriate. Enter an absolute URL where the producer's web site is found, such as http://www.my.org. Enter full URL, starting with http:// url 39 <a href="#VALUE" target="_blank" rel="noopener">#VALUE</a> FALSE FALSE FALSE FALSE FALSE FALSE producer citation
producerLogoURL Logo URL URL for the producer's logo, which points to this producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif. Enter full URL for image, starting with http:// url 40 <img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/> FALSE FALSE FALSE FALSE FALSE FALSE producer citation
productionDate Production Date Date when the data collection or other materials were produced (not distributed, published or archived). YYYY-MM-DD date 41 TRUE FALSE FALSE TRUE FALSE FALSE citation
productionPlace Production Place The location where the data collection and any other related materials were produced. text 42 FALSE FALSE FALSE FALSE FALSE FALSE citation
productionPlace Production Place The location where the data collection and any other related materials were produced. text 42 FALSE FALSE TRUE TRUE FALSE FALSE citation
contributor Contributor The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource. none 43 : FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/contributor
contributorType Type The type of contributor of the resource. text 44 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE contributor citation
contributorName Name The Family Name, Given Name or organization name of the contributor. FamilyName, GivenName or Organization text 45 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE contributor citation
Expand All @@ -66,7 +66,7 @@
dateOfCollectionStart Start Date when the data collection started. YYYY-MM-DD date 62 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation
dateOfCollectionEnd End Date when the data collection ended. YYYY-MM-DD date 63 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation
kindOfData Kind of Data Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other. text 64 TRUE FALSE TRUE TRUE FALSE FALSE citation http://rdf-vocabulary.ddialliance.org/discovery#kindOfData
series Series Information about the Dataset series. none 65 : FALSE FALSE FALSE FALSE FALSE FALSE citation
series Series Information about the Dataset series. none 65 : FALSE FALSE TRUE FALSE FALSE FALSE citation
seriesName Name Name of the dataset series to which the Dataset belongs. text 66 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE series citation
seriesInformation Information History of the series and summary of those features that apply to the series as a whole. textbox 67 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE series citation
software Software Information about the software used to generate the Dataset. none 68 , FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasGeneratedBy
Expand Down