diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.cpp index e5979b4653..6508d595f7 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.cpp +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.cpp @@ -34,16 +34,16 @@ QString resourceUrl(const QString &pResource) { // Return the URL for the given resource - return "https://identifiers.org/"+pResource+"/?redirect=true"; + return "https://registry.identifiers.org/registry/"+pResource; } //============================================================================== -QString idUrl(const QString &pResource, const QString &pId) +QString idUrl(const QString &pId) { // Return the URL for the given resource - return "https://identifiers.org/"+pResource+"/"+pId+"/?profile=most_reliable&redirect=true"; + return "https://identifiers.org/"+pId; } //============================================================================== diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.h index 3b82615bfc..69f42d025a 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.h +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationview.h @@ -35,7 +35,7 @@ namespace CellMLAnnotationView { //============================================================================== QString resourceUrl(const QString &pResource); -QString idUrl(const QString &pResource, const QString &pId); +QString idUrl(const QString &pId); //============================================================================== diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp index ff8148d8e7..1d78dd8967 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp @@ -288,13 +288,12 @@ void CellmlAnnotationViewEditingWidget::updateWebViewerWithResourceDetails(WebVi //============================================================================== void CellmlAnnotationViewEditingWidget::updateWebViewerWithIdDetails(WebViewerWidget::WebViewerWidget *pWebViewer, - const QString &pResource, const QString &pId) { // The user requested a resource id to be looked up, so retrieve it using // identifiers.org - pWebViewer->webView()->load(idUrl(pResource, pId)); + pWebViewer->webView()->load(idUrl(pId)); } //============================================================================== diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h index 13ed3771dd..c713a8d87d 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h @@ -102,7 +102,6 @@ private slots: void updateWebViewerWithResourceDetails(WebViewerWidget::WebViewerWidget *pWebViewer, const QString &pResource); void updateWebViewerWithIdDetails(WebViewerWidget::WebViewerWidget *pWebViewer, - const QString &pResource, const QString &pId); }; diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp index 3b24ee798b..c696d033d5 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp @@ -319,15 +319,14 @@ void CellmlAnnotationViewMetadataDetailsWidget::lookUpResource(const QString &pR //============================================================================== -void CellmlAnnotationViewMetadataDetailsWidget::lookUpId(const QString &pResource, - const QString &pId) +void CellmlAnnotationViewMetadataDetailsWidget::lookUpId(const QString &pId) { // Let people know that we want our Web viewer to be updated with some // details about the given id mWebViewer->progressBarWidget()->setEnabled(true); - emit idDetailsRequested(mWebViewer, pResource, pId); + emit idDetailsRequested(mWebViewer, pId); } //============================================================================== diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h index 4e30799962..16e20d2601 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h @@ -112,7 +112,7 @@ class CellmlAnnotationViewMetadataDetailsWidget : public Core::Widget void resourceDetailsRequested(WebViewerWidget::WebViewerWidget *pWebViewer, const QString &pResource); void idDetailsRequested(WebViewerWidget::WebViewerWidget *pWebViewer, - const QString &pResource, const QString &pId); + const QString &pId); public slots: void updateGui(iface::cellml_api::CellMLElement *pElement); @@ -122,7 +122,7 @@ private slots: void lookUpQualifier(const QString &pQualifier); void lookUpResource(const QString &pResource); - void lookUpId(const QString &pResource, const QString &pId); + void lookUpId(const QString &pId); void lookUpNothing(); void removeAllMetadata(); diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp index f8cde4a0ab..59b0fb111b 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp @@ -561,7 +561,7 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::updateItemsGui(const CellmlA mUrls.insert(item.resource(), resourceUrl(item.resource())); } - mUrls.insert(itemInformation, idUrl(item.resource(), item.id())); + mUrls.insert(itemInformation, idUrl(item.id())); mItemInformationSha1s << itemInformationSha1; @@ -723,7 +723,7 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::genericLookUp(const QString break; case InformationType::Id: - emit idLookUpRequested(resource, id); + emit idLookUpRequested(id); break; } diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.h index 4d08217b40..726fa69753 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.h +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.h @@ -187,7 +187,7 @@ class CellmlAnnotationViewMetadataEditDetailsWidget : public Core::Widget signals: void qualifierLookUpRequested(const QString &pQualifier); void resourceLookUpRequested(const QString &pResource); - void idLookUpRequested(const QString &pResource, const QString &pId); + void idLookUpRequested(const QString &pId); void noLookUpRequested(); public slots: diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp index 852779fe64..695f289e24 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.cpp @@ -306,7 +306,7 @@ void CellmlAnnotationViewMetadataNormalViewDetailsWidget::addRdfTriple(CellMLSup mUrls.insert(pRdfTriple->resource(), resourceUrl(pRdfTriple->resource())); } - mUrls.insert(rdfTripleInformation, idUrl(pRdfTriple->resource(), pRdfTriple->id())); + mUrls.insert(rdfTripleInformation, idUrl(pRdfTriple->id())); mRdfTripleInformationSha1s << rdfTripleInformationSha1; @@ -431,7 +431,7 @@ void CellmlAnnotationViewMetadataNormalViewDetailsWidget::genericLookUp(const QS break; case InformationType::Id: - emit idLookUpRequested(resource, id); + emit idLookUpRequested(id); break; } diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.h b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.h index ab26ec919c..e1163baa19 100644 --- a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.h +++ b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.h @@ -140,7 +140,7 @@ class CellmlAnnotationViewMetadataNormalViewDetailsWidget : public Core::Widget signals: void qualifierLookUpRequested(const QString &pQualifier); void resourceLookUpRequested(const QString &pResource); - void idLookUpRequested(const QString &pResource, const QString &pId); + void idLookUpRequested(const QString &pId); void noLookUpRequested(); void rdfTripleRemoved(CellMLSupport::CellmlFileRdfTriple *pRdfTriple);