@ -118,6 +118,7 @@ public class CKANPackage extends CKAN implements Moderated {
protected final List < CKANResource > managedResources ;
protected String itemID ;
protected String itemURL ;
protected final CKANUser ckanUser ;
@ -662,12 +663,12 @@ public class CKANPackage extends CKAN implements Moderated {
protected String addItemURLViaResolver ( JsonNode jsonNode ) {
// Adding Item URL via Resolver
Str ing catalogueI temURL = URIResolver . getCatalogueItemURL ( name ) ;
addExtraField ( jsonNode , EXTRAS_ITEM_URL_KEY , catalogueI temURL) ;
return catalogueI temURL;
itemURL = URIResolver . getCatalogueItemURL ( name ) ;
addExtraField ( jsonNode , EXTRAS_ITEM_URL_KEY , i temURL) ;
return i temURL;
}
protected void sendSocialPost ( String title , String catalogueItemURL ) {
protected void sendSocialPost ( String title ) {
try {
boolean makePost = false ;
try {
@ -683,7 +684,7 @@ public class CKANPackage extends CKAN implements Moderated {
ArrayNode arrayNode = ( ArrayNode ) result . get ( TAGS_KEY ) ;
SocialPost socialPost = new SocialPost ( ) ;
socialPost . setItemID ( itemID ) ;
socialPost . setItemURL ( catalogueI temURL) ;
socialPost . setItemURL ( i temURL) ;
socialPost . setTags ( arrayNode ) ;
socialPost . setItemTitle ( title ) ;
@ -720,6 +721,7 @@ public class CKANPackage extends CKAN implements Moderated {
if ( this . itemID = = null ) {
this . itemID = result . get ( ID_KEY ) . asText ( ) ;
}
itemURL = getExtraField ( result , EXTRAS_ITEM_URL_KEY ) . asText ( ) ;
}
@ -763,9 +765,8 @@ public class CKANPackage extends CKAN implements Moderated {
( ( ObjectNode ) jsonNode ) . remove ( RESOURCES_KEY ) ;
}
String catalogueItemURL = "" ;
if ( configuration . getScopeBean ( ) . is ( Type . VRE ) ) {
catalogueItemURL = addItemURLViaResolver( jsonNode ) ;
addItemURLViaResolver( jsonNode ) ;
}
super . create ( getAsString ( jsonNode ) ) ;
@ -780,7 +781,7 @@ public class CKANPackage extends CKAN implements Moderated {
if ( configuration . getScopeBean ( ) . is ( Type . VRE ) ) {
// Actions performed after a package has been correctly created on ckan.
String title = result . get ( TITLE_KEY ) . asText ( ) ;
sendSocialPost ( title , catalogueItemURL );
sendSocialPost ( title );
}
}
@ -1291,7 +1292,7 @@ public class CKANPackage extends CKAN implements Moderated {
private void postItemCreated ( ) throws Exception {
try {
if ( isModerationEnabled ( ) ) {
moderationThread . setItemCoordinates ( itemID , name );
moderationThread . setItemCoordinates ( itemID , name , itemURL );
moderationThread . postItemCreated ( ) ;
}
} catch ( WebApplicationException e ) {
@ -1304,7 +1305,7 @@ public class CKANPackage extends CKAN implements Moderated {
private void postItemUpdated ( ) {
try {
if ( isModerationEnabled ( ) ) {
moderationThread . setItemCoordinates ( itemID , name );
moderationThread . setItemCoordinates ( itemID , name , itemURL );
moderationThread . postItemUpdated ( ) ;
}
} catch ( WebApplicationException e ) {
@ -1336,14 +1337,14 @@ public class CKANPackage extends CKAN implements Moderated {
String ret = sendPostRequest ( ITEM_UPDATE , getAsString ( result ) ) ;
result = mapper . readTree ( ret ) ;
moderationThread . setItemCoordinates ( itemID , name ) ;
itemURL = getExtraField ( result , EXTRAS_ITEM_URL_KEY ) . asText ( ) ;
moderationThread . setItemCoordinates ( itemID , name , itemURL ) ;
moderationThread . postItemApproved ( moderatorMessage ) ;
if ( configuration . getScopeBean ( ) . is ( Type . VRE ) ) {
// Actions performed after a package has been correctly created on ckan.
String title = result . get ( TITLE_KEY ) . asText ( ) ;
String catalogueItemURL = getExtraField ( result , EXTRAS_ITEM_URL_KEY ) . asText ( ) ;
sendSocialPost ( title , catalogueItemURL ) ;
sendSocialPost ( title ) ;
}
break ;
@ -1384,7 +1385,7 @@ public class CKANPackage extends CKAN implements Moderated {
String ret = sendPostRequest ( ITEM_PATCH , getAsString ( result ) ) ;
result = mapper . readTree ( ret ) ;
moderationThread . setItemCoordinates ( itemID , name );
moderationThread . setItemCoordinates ( itemID , name , itemURL );
moderationThread . postItemRejected ( moderatorMessage ) ;
break ;
@ -1420,7 +1421,7 @@ public class CKANPackage extends CKAN implements Moderated {
}
CMItemStatus cmItemStatus = getCMItemStatus ( ) ;
moderationThread . setItemCoordinates ( itemID , name );
moderationThread . setItemCoordinates ( itemID , name , itemURL );
moderationThread . postUserMessage ( cmItemStatus , message ) ;
return ;
}