openpreserve#273

rgfeldman · Dec 14, 2016 · 1aae02e · 1aae02e
1 parent 8d6e6c5
commit 1aae02e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/edu/si/CDIS/CreateCISmedia.java b/src/edu/si/CDIS/CreateCISmedia.java
@@ -96,7 +96,7 @@ private void processUoiid (String uoiId) {
         if (!mapRecordExists) {    
             //  In the cases where media was put into DAMS by something other than CDIS, there will be no existing map entry there
             //      and we will need to add it  
-            cdisMap.setCdisCisMediaTypeId(Integer.parseInt(CDIS.getProperty("cdisCisMediaTypeId")) );
+            cdisMap.setCdisCisMediaTypeId(Integer.parseInt(CDIS.getProperty("mediaTypeConfigId")) );
 
             boolean mapCreated = cdisMap.createRecord();
             if (!mapCreated) {

diff --git a/src/edu/si/CDIS/LinkToDAMS.java b/src/edu/si/CDIS/LinkToDAMS.java
@@ -13,7 +13,7 @@
 import edu.si.CDIS.DAMS.Database.SiPreservationMetadata;
 import edu.si.CDIS.DAMS.Database.Uois;
 import edu.si.CDIS.DAMS.StagedFile;
-import edu.si.CDIS.Database.CdisCisMediaTypeR;
+import edu.si.CDIS.Database.MediaTypeConfigR;
 import edu.si.CDIS.Database.CDISActivityLog;
 import edu.si.CDIS.DAMS.MediaRecord;
 import edu.si.CDIS.Database.CDISMap;
@@ -222,11 +222,11 @@ public void link () {
 
             //Check to see if we have to move this filetype to the post-ingest delivery area
             cdisMap.populateCdisCisMediaTypeId();
-            CdisCisMediaTypeR cdisCisMediaTypeR = new CdisCisMediaTypeR();
-            cdisCisMediaTypeR.setCdisCisMediaTypeId(cdisMap.getCdisCisMediaTypeId());
-            cdisCisMediaTypeR.populatePostIngestDelivery();
+            MediaTypeConfigR mediaTypeConfigR = new MediaTypeConfigR();
+            mediaTypeConfigR.setMediaTypeConfigId(cdisMap.getMediaTypeConfigId());
+            mediaTypeConfigR.populatePostIngestDelivery();
 
-            if (cdisCisMediaTypeR.getPostIngestDelivery().equals("Y")) {
+            if (mediaTypeConfigR.getPostIngestDelivery().equals("Y")) {
                 StagedFile stagedFile = new StagedFile();
                 stagedFile.setBasePath(pathBase);
                 stagedFile.setPathEnding(pathEnding);

diff --git a/src/edu/si/CDIS/MetaDataSync.java b/src/edu/si/CDIS/MetaDataSync.java
@@ -197,11 +197,9 @@ private boolean generateSql(String uoiId, boolean parentChildSync) {
                     case "IS_RESTRICTED" :
                     case "MANAGING_UNIT" :
                     case "MAX_IDS_SIZE" :
+                    case "ORIGINAL_FILE_NAME" :
                     case "PUBLIC_USE" :                  
                     case "SEC_POLICY_ID" :
-                    case "TERMS_AND_RESTRICTIONS" :
-                    case "RESTRICTIONS" :
-                    case "RIGHTS_SUMMARY_CORE" :
                         continue;
                 }
             }

diff --git a/src/edu/si/CDIS/SendToHotFolder.java b/src/edu/si/CDIS/SendToHotFolder.java
@@ -7,7 +7,7 @@
 
 import edu.si.CDIS.DAMS.StagedFile;
 import edu.si.CDIS.Database.CDISActivityLog;
-import edu.si.CDIS.Database.CdisCisMediaTypeR;
+import edu.si.CDIS.Database.MediaTypeConfigR;
 import edu.si.CDIS.Database.CDISMap;
 import edu.si.CDIS.Database.VFCUMediaFile;
 import edu.si.CDIS.utilties.ErrorLog;
@@ -105,10 +105,10 @@ private boolean populateMediaTypeId(CDISMap cdisMap) {
 
             if (mediaTypeId.contains(",") ) {
                 //find the right media type_id by the lookup table by matching the filename
-                CdisCisMediaTypeR cdisCisMediaTypeR = new CdisCisMediaTypeR();
-                cdisCisMediaTypeR.populateIdFromFileName(cdisMap.getFileName());
+                MediaTypeConfigR mediaTypeConfigId = new MediaTypeConfigR();
+                mediaTypeConfigId.populateIdFromFileName(cdisMap.getFileName());
 
-                cdisMap.setCdisCisMediaTypeId(cdisCisMediaTypeR.getCdisCisMediaTypeId());
+                cdisMap.setCdisCisMediaTypeId(mediaTypeConfigId.getMediaTypeConfigId());
             }
             else {
                 //Send the string to numeric form