Allow to use either logical_file_name or this_logical_file_name in bu…

…lkblocks API input. The former can be used by clients (CRABPublisher), while latter is used by blockdump DBS API used within DBSMigration python server

dbs/blockdump.go

@@ -405,8 +405,11 @@ func getFileParentList(blk string, wg *sync.WaitGroup, fileParentList *FileParen
 		fileParent := FileParentRecord{}
 		var pid sql.NullInt64
 		var pfn sql.NullString
+		// blockdump DBS API should yield this_logical_file_name
+		// therefore, here we use it
 		err = rows.Scan(
-			&fileParent.LogicalFileName,
+			//             &fileParent.LogicalFileName,
+			&fileParent.ThisLogicalFileName,
 			&pid,
 			&pfn,
 		)

dbs/fileparents.go

@@ -365,9 +365,15 @@ func (a *API) InsertFileParentsBlockTxt(tx *sql.Tx) error {
 }
 
 // FileParentRecord represents file parent DBS record
-// used by bulkblock API
+// used by bulkblocks API
+// NOTE: bulkblocks API should return this_logical_file_name as it is used by DBS migrate
+// while users, e.g. CRAB, can construct by themselves the bulkblock structure where
+// they may use logical_file_name name
+// Therefore, we should keep both this_logical_file_name and logical_file_name
+// together for backward compatibility
 type FileParentRecord struct {
-	LogicalFileName       string `json:"this_logical_file_name"`
+	ThisLogicalFileName   string `json:"this_logical_file_name, omitempty"`
+	LogicalFileName       string `json:"logical_file_name, omitempty"`
 	ParentFileId          int64  `json:"parent_file_id"`
 	ParentLogicalFileName string `json:"parent_logical_file_name"`
 }
@@ -408,6 +414,10 @@ func (a *API) InsertFileParentsTxt(tx *sql.Tx) error {
 			log.Printf("Insert FileParents record %+v", rec)
 		}
 		lfn := rec.LogicalFileName
+		// for backward compatibility
+		if lfn == "" {
+			lfn = rec.ThisLogicalFileName
+		}
 		pfn := rec.ParentLogicalFileName
 		// get file id for given lfn
 		fid, err := GetID(tx, "FILES", "file_id", "logical_file_name", lfn)