plugin API: support new DB_DataReplaced/Merged/Conflict status codes

For these codes the local ID must be passed through to the caller.
For DB_Conflict no real changes were made in the plugin, so after
write scripts and blog writing are not invoked.

1 files changed, 16 insertions, 12 deletions

diff --git a/src/DB_interfaces/api_db/pluginapids.cpp b/src/DB_interfaces/api_db/pluginapids.cpp
index 54a63ad..e2b5a9b 100755
--- a/src/DB_interfaces/api_db/pluginapids.cpp
+++ b/src/DB_interfaces/api_db/pluginapids.cpp
@@ -1325,23 +1325,27 @@ localstatus TPluginApiDS::apiAddItem(TMultiFieldItem &aItem, string &aLocalID)
   #endif
   // now check result
   if (dberr==LOCERR_OK ||
+      dberr==DB_Conflict ||
+      dberr==DB_DataReplaced ||
       dberr==DB_DataMerged) {
     // save new ID
     aLocalID = itemAndParentID.item.c_str();
     aItem.setLocalID(aLocalID.c_str()); // make sure item itself has correct ID as well
-    // now write all the BLOBs
-    writeBlobs(false,aItem,0);
-    #ifdef SCRIPT_SUPPORT
-    // process overall afterwrite script
-    fWriting=true;
-    fInserting=true;
-    fDeleting=false;
-    fPluginAgentP->fScriptContextDatastore=this;
-    if (!TScriptContext::execute(fScriptContextP,fPluginDSConfigP->fFieldMappings.fAfterWriteScript,fPluginDSConfigP->getDSFuncTableP(),fPluginAgentP,&aItem,true)) {
-      PDEBUGPRINTFX(DBG_ERROR,("<afterwritescript> failed"));
-      dberr = LOCERR_WRONGUSAGE;
+    if (dberr!=DB_Conflict) {
+      // now write all the BLOBs
+      writeBlobs(false,aItem,0);
+      #ifdef SCRIPT_SUPPORT
+      // process overall afterwrite script
+      fWriting=true;
+      fInserting=true;
+      fDeleting=false;
+      fPluginAgentP->fScriptContextDatastore=this;
+      if (!TScriptContext::execute(fScriptContextP,fPluginDSConfigP->fFieldMappings.fAfterWriteScript,fPluginDSConfigP->getDSFuncTableP(),fPluginAgentP,&aItem,true)) {
+        PDEBUGPRINTFX(DBG_ERROR,("<afterwritescript> failed"));
+        dberr = LOCERR_WRONGUSAGE;
+      }
+      #endif
     }
-    #endif
   }
   // return status
   return dberr;