Skip to content
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

DSpace 7 Upgrade Sprint 5 #251

Merged
merged 14 commits into from
Feb 22, 2024
Merged

DSpace 7 Upgrade Sprint 5 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9faba2c
Refactor proxy license bundle upload and license bundle management
wwtamu Jan 24, 2024
847bd0f
Remove all matches in the license bundle
wwtamu Jan 26, 2024
f70da27
copy clean WorkspaceItemRestRepository to modules server
wwtamu Jan 29, 2024
d0bdb48
Prevent proxy license step from invoking upload during start submissi…
wwtamu Jan 29, 2024
426850f
Add extraction step to submission processes
wwtamu Jan 29, 2024
13cda26
Merge pull request #245 from TAMULib/dspace-7_x-sprint5-244-proxy-lic…
wwtamu Jan 29, 2024
ca08618
Add Vireo thesis metadata types
wwtamu Jan 30, 2024
8afb60b
Merge pull request #242 from TAMULib/tamu-dspace-7_x-proxy-license-up…
wwtamu Jan 30, 2024
23afa45
Merge pull request #246 from TAMULib/dspace-7_x-sprint5-243-extract-m…
wwtamu Jan 30, 2024
00e7948
Merge pull request #247 from TAMULib/dspace-7_x-sprint5-vireo-thesis-…
wwtamu Jan 30, 2024
e8463ec
Only index when anonymous resource policy start date is null
wwtamu Jan 30, 2024
742e26e
Improve resource policy is indexable condition
wwtamu Jan 31, 2024
3c92dfc
Correct inverted comparison of resource policy end date and now
wwtamu Feb 1, 2024
6a78cc2
Merge pull request #248 from TAMULib/dspace-7_x-sprint5-204-restricte…
wwtamu Feb 2, 2024
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 dspace/config/item-submission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->
<step id="extractionstep"/>

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>
Expand Down Expand Up @@ -354,7 +354,7 @@
<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->
<step id="extractionstep"/>

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>
Expand Down Expand Up @@ -386,7 +386,7 @@
<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->
<step id="extractionstep"/>

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>
Expand Down Expand Up @@ -418,7 +418,7 @@
<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->
<step id="extractionstep"/>

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>
Expand Down
28 changes: 28 additions & 0 deletions dspace/config/registries/thesis-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<namespace>http://digital.library.tamu.edu/schemas/thesis/</namespace>
</dc-schema>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
<qualifier>college</qualifier>
<scope_note></scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
Expand Down Expand Up @@ -50,13 +57,34 @@
<scope_note>Level of education associated with the document. Examples: bachelor's, master's, doctoral, post-doctoral, other.</scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
<qualifier>major</qualifier>
<scope_note></scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
<qualifier>name</qualifier>
<scope_note>Name of the degree associated with the work as it appears within the work. (example: Masters in Operations Research)</scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
<qualifier>program</qualifier>
<scope_note></scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>degree</element>
<qualifier>school</qualifier>
<scope_note></scope_note>
</dc-type>

<dc-type>
<schema>thesis</schema>
<element>sequence</element>
Expand Down
12 changes: 11 additions & 1 deletion dspace/modules/additions/src/main/java/org/dspace/discovery/FullTextContentStreams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
import java.util.ArrayList;
// TAMU Customization - Only index text bitstreams that are not restricted
import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
Expand All @@ -26,6 +28,8 @@
import com.google.common.collect.Iterables;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
// TAMU Customization - Only index text bitstreams that are not restricted
import org.apache.commons.lang3.time.DateUtils;
import org.apache.logging.log4j.Logger;
import org.apache.solr.common.util.ContentStreamBase;
import org.dspace.authorize.AuthorizeException;
Expand Down Expand Up @@ -94,7 +98,13 @@ private void buildFullTextList(Item parentItem) throws SQLException {

for (ResourcePolicy rp:bundlePolicies) {
if (rp.getdSpaceObject().getID() == fulltextBitstream.getID()) {
if (rp.getGroup().getName().equalsIgnoreCase("anonymous")) {
Date start = rp.getStartDate();
Date end = rp.getEndDate();
Date now = new Date();
if (rp.getGroup().getName().equalsIgnoreCase("anonymous")
&& (start == null || ((start.before(now) || DateUtils.isSameDay(start, now))
&& (end == null || (end.after(now) || DateUtils.isSameDay(now, end)))))
) {
isIndexable = true;
}
break;
Expand Down
Loading
Loading