マイグレーション対応 JSONにObjectIdがなかった場合でもエラーにならないようにする

abvw/common/js/common.js

@@ -2512,6 +2512,8 @@ function RegisterLog() {
 				for (var nIndex2 = 0; nIndex2 < objectLogArray.length; nIndex2++) {
 					actionDate = new Date(objectLogArray[nIndex2].actionDate);
 					var line = [];
+					
+					if( objectLogArray[nIndex2].objectId ){
 						line.push(actionDate.jpDateTimeString1());
 						line.push(objectLogArray[nIndex2].pageNo);
 						line.push(objectLogArray[nIndex2].objectId);
@@ -2527,6 +2529,7 @@ function RegisterLog() {
 						lines.push(line);
 						//alert("ObjectLog Line:" + JSON.stringify( line ) );
 					}
+				}
 				//alert("ObjectLog Lines:" + JSON.stringify( lines ) );
 			
 				if( lines.length > 0 ){

abvw/js/contentview_CallApi.js

@@ -51,12 +51,16 @@ function webGetContentPageSize(){
      "GET",
      { contentId: contentID, sid: ClientData.userInfo_sid(), getType: 6 },
      function (data) {
+         if( data.contentData.pageInfoData.pagesInfo ){
              $.each(data.contentData.pageInfoData.pagesInfo, function(i, n){
                  contentPageSizeArr.push(n);
              });
              
              //Get Page size of firstPage
              getPageSizeByPageNo(1);
+         } else {
+             showErrorScreen();
+         }
      },
      null); 
 };

abvw/js/contentview_GetData.js

@@ -145,7 +145,11 @@ function getMediaType1(iValueObj) {
     pageObject['id'] = "MediaType1_" + iValueObj.action.actionType;
     
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
     
     if (iValueObj.action.actionType == 0) {
         /*get mediaInfo */
@@ -403,7 +407,11 @@ function getMediaType2(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -448,7 +456,11 @@ function getMediaType3(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -492,7 +504,11 @@ function getMediaType4(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用（使わない）
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -524,7 +540,11 @@ function getMediaType5(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用（使わない）
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -589,7 +609,11 @@ function getMediaType6(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -627,7 +651,11 @@ function getMediaType7(iValueObj) {
     pageObject['visible'] = true;
 
     //詳細ログ用（使わない）
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -680,7 +708,11 @@ function getMediaType8(iValueObj) {
     }
 
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
 
     return pageObject;
 };
@@ -701,7 +733,11 @@ function getMediaType9(iValueObj) {
     pageObject['visible'] = true;
     
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
     
     if(iValueObj.action.actionType == 11){        
         var resourceId = iValueObj.mediaInfo.resourceId;
@@ -743,7 +779,11 @@ function getMediaType11(iValueObj) {
     pageObject['visible'] = true;
     
     //詳細ログ用
+    try{
         pageObject["objectId"] = iValueObj.action.objectId;
+    }catch(e){
+        pageObject["objectId"] = "";
+    }
     
    if(iValueObj.action.actionType == 12){
         var resourceId = iValueObj.mediaInfo.resourceId;