From f85bbf12ca9b72ae04c32a0bc518dbfcccf92af4 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 22 Dec 2021 13:59:08 +0000
Subject: [PATCH] Applied reserved "default" keyword when publishing data too -
 it now maps to a blank identifier.

---
 .../arbitrary/ArbitraryDataTransactionBuilder.java       | 5 +++++
 .../java/org/qortal/arbitrary/ArbitraryDataWriter.java   | 7 ++++++-
 tools/qdata                                              | 9 +++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataTransactionBuilder.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataTransactionBuilder.java
index abf72f54..24754694 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataTransactionBuilder.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataTransactionBuilder.java
@@ -64,6 +64,11 @@ public class ArbitraryDataTransactionBuilder {
         this.name = name;
         this.method = method;
         this.service = service;
+
+        // If identifier is a blank string, or reserved keyword "default", treat it as null
+        if (identifier == null || identifier.equals("") || identifier.equals("default")) {
+            identifier = null;
+        }
         this.identifier = identifier;
     }
 
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java
index f27a8269..c076f8b1 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java
@@ -54,9 +54,14 @@ public class ArbitraryDataWriter {
         this.filePath = filePath;
         this.name = name;
         this.service = service;
-        this.identifier = identifier;
         this.method = method;
         this.compression = compression;
+
+        // If identifier is a blank string, or reserved keyword "default", treat it as null
+        if (identifier == null || identifier.equals("") || identifier.equals("default")) {
+            identifier = null;
+        }
+        this.identifier = identifier;
     }
 
     public void save() throws IOException, DataException, InterruptedException, MissingDataException {
diff --git a/tools/qdata b/tools/qdata
index 9c8668f1..b1e9720b 100755
--- a/tools/qdata
+++ b/tools/qdata
@@ -55,11 +55,8 @@ if [[ "${method}" == "POST" ]]; then
     echo "Error: missing private key. Set it by running: export QORTAL_PRIVKEY=privkeyhere"; exit
   fi
 
-  # Create identifier component in URL
-  if [[ -z "${identifier}" || "${identifier}" == "default" ]]; then
-      identifier_component=""
-  else
-      identifier_component="/${identifier}"
+  if [ -z "${identifier}" ]; then
+    identifier="default"
   fi
 
   # Create type component in URL
@@ -70,7 +67,7 @@ if [[ "${method}" == "POST" ]]; then
   fi
 
   echo "Creating transaction - this can take a while..."
-  tx_data=$(curl --silent --insecure -X ${method} "http://${host}:${port}/arbitrary/${service}/${name}${identifier_component}${type_component}" -d "${data}")
+  tx_data=$(curl --silent --insecure -X ${method} "http://${host}:${port}/arbitrary/${service}/${name}/${identifier}${type_component}" -d "${data}")
 
   if [[ "${tx_data}" == *"error"* || "${tx_data}" == *"ERROR"* ]]; then
     echo "${tx_data}"; exit