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.

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

Small updates to make current vostools work with new services #218

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ protected VOSpaceTransfer(NodePersistence per, JobUpdater jobUpdater, Job job, T

void validateView()
throws TransferException, Exception {
if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)) {
if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)
&& !transfer.getView().getURI().equals(new URI("ivo://cadc.nrc.ca/vospace/view#data"))) {
Views views = nodePersistence.getViews();
View view = views.getView(transfer.getView().getURI());
if (view == null) {
Expand Down
2 changes: 1 addition & 1 deletion cadc-vos/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '2.0.2'
version = '2.0.3'

description = 'OpenCADC VOSpace client library'
def git_url = 'https://github.com/opencadc/vos'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
package org.opencadc.vospace.io;

import ca.nrc.cadc.date.DateUtil;
import ca.nrc.cadc.util.StringUtil;
import ca.nrc.cadc.xml.XmlUtil;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -481,7 +482,7 @@ protected Set<GroupURI> getGroupURIs(URI key, String delimiter, Set<NodeProperty
Set<GroupURI> groups = new TreeSet<>();
NodeProperty nodeProperty = getNodeProperty(key, properties);
if (nodeProperty != null) {
if (nodeProperty.getValue() != null) {
if (StringUtil.hasText(nodeProperty.getValue())) {
String[] values = nodeProperty.getValue().split(delimiter);
for (String value : values) {
GroupURI groupURI;
Expand Down
Loading