定数値の誤り修正

abvw/common/js/common.js

@@ -244,9 +244,9 @@ var Keys = {
     // Session :コンテンツ詳細情報(contentInfo)_リソース更新バージョン:Interger
     contentInfo_resourceVersion: 'contentInfo_resourceVersion',
     // Session :コンテンツ詳細情報(contentInfo)_PDF総ページ数:Interger
-    contentInfo_allPageNum: 'allPageNum',
+    contentInfo_allPageNum: 'contentInfo_allPageNum',
     // Session :(contentType):String
-    contentInfo_contentType: 'allPageNum',
+    contentInfo_contentType: 'contentInfo_contentType',
     // Session :検索条件(searchCond)_検索テキスト:String
     searchCond_searchText: 'searchText',
     // Session :検索条件(searchCond)_検索区分:Interger(1:コンテンツ検索, 2:タグ検索, 3:全文検索)
@@ -401,148 +401,6 @@ function ObjectLogEntity(){
     this.locationWidth = "";
 };
 
-// No.17 Phase 2: do not use this function
-// Build memo/marking/bookmark to base64string
-/*
-function buildBackupData() {
-    var result =[];
-    var template1 = { type: 1, data: [] };
-    var template2 = { type: 2, data: [] };
-    var template3 = { type: 3, data: [] };
-
-
-    // Build for bookmark
-    for (var nIndex = 0; nIndex < ClientData.BookMarkData().length; nIndex++) {
-        
-        var oneItem = { contentid: ClientData.BookMarkData()[nIndex].contentid,
-                        pageNo: ClientData.BookMarkData()[nIndex].pageNo,
-                        contentTitle: ClientData.BookMarkData()[nIndex].contentTitle,
-                        contentTitleKana: ClientData.BookMarkData()[nIndex].contentTitleKana,
-                        registerDate: ClientData.BookMarkData()[nIndex].registerDate
-                        };
-        template3.data.push(oneItem);
-    }
-    result.push(template3);
-
-    // Build for marking
-    for (var nIndex = 0; nIndex < ClientData.MarkingData().length; nIndex++) {
-        var oneItem1 = { contentid: ClientData.MarkingData()[nIndex].contentid, pageNo: ClientData.MarkingData()[nIndex].pageNo, content: ClientData.MarkingData()[nIndex].content };
-        template2.data.push(oneItem1);
-    }
-    result.push(template2);
-
-    // Build for memo
-    for (var nIndex = 0; nIndex < ClientData.MemoData().length; nIndex++) {
-        var oneItem2 = { contentid: ClientData.MemoData()[nIndex].contentid,
-            pageNo: ClientData.MemoData()[nIndex].pageNo,
-            posX: ClientData.MemoData()[nIndex].posX,
-            posY: ClientData.MemoData()[nIndex].posY,
-            Text: ClientData.MemoData()[nIndex].Text,
-            // Add for phase 2
-            memoid:ClientData.MemoData()[nIndex].memoid,
-	        registerDate: ClientData.MemoData()[nIndex].registerDate
-        };
-        template1.data.push(oneItem2);
-    }
-    result.push(template1);
-
-    return result;
-};
-*/
-// No.17 Phase 2: do not use this function
-/*
-  Restore data from server to local
-*/
-/*
-function restoreData(jsonString) {
-
-    var data = jsonString;
-    //var data = JSON.parse(jsonString);
-
-    // Clear memo in client
-    var arr = ClientData.MemoData();
-    arr.clear();
-    ClientData.MemoData(arr);
-
-    // Clear marking in client
-    arr = ClientData.MarkingData();
-    arr.clear();
-    ClientData.MarkingData(arr);
-
-    // Clear marking in client
-    arr = ClientData.BookMarkData();
-    arr.clear();
-    ClientData.BookMarkData(arr);
-
-    var arrMarking = [];
-    var arrBookMark = [];
-    var arrMemo = [];
-    for (var nIndex = 0; nIndex < data.length; nIndex++) {
-
-
-        var oneType = data[nIndex];
-        // Memo
-        if (oneType.type == 1) {
-            for (var nIndex1 = 0; nIndex1 < oneType.data.length; nIndex1++) {
-                var obj = new MemoEntity();
-                obj.contentid = oneType.data[nIndex1].contentid;
-                obj.pageNo = oneType.data[nIndex1].pageNo;
-                obj.posX = oneType.data[nIndex1].posX;
-                obj.posY = oneType.data[nIndex1].posY;
-                obj.Text = oneType.data[nIndex1].Text;
-				
-				//Add for phase2
-				obj.memoid = oneType.data[nIndex1].memoid;
-				obj.registerDate = oneType.data[nIndex1].registerDate;
-				
-                // Add object to client
-                arrMemo.push(obj);
-            }
-        }
-
-        // Marking
-        if (oneType.type == 2) {
-            for (var nIndex1 = 0; nIndex1 < oneType.data.length; nIndex1++) {
-                var obj = new MarkingEntity();
-                obj.contentid = oneType.data[nIndex1].contentid;
-                obj.pageNo = oneType.data[nIndex1].pageNo;
-                obj.content = oneType.data[nIndex1].content;
-				
-				//Add for phase2
-				obj.markingid = oneType.data[nIndex1].markingid;
-				obj.registerDate = oneType.data[nIndex1].registerDate;
-				
-                // Add object to client
-                arrMarking.push(obj);
-            }
-        }
-        // Bookmark
-        if (oneType.type == 3) {
-
-            for (var nIndex1 = 0; nIndex1 < oneType.data.length; nIndex1++) {
-                var obj = new BookMarkEntity();
-                obj.contentid = oneType.data[nIndex1].contentid;
-                obj.pageNo = oneType.data[nIndex1].pageNo;
-                obj.contentTitle = oneType.data[nIndex1].contentTitle;
-                obj.contentTitleKana = oneType.data[nIndex1].contentTitleKana;
-                obj.registerDate = oneType.data[nIndex1].registerDate;
-				
-				//Add for phase2
-				obj.bookmarkid = oneType.data[nIndex1].bookmarkid;
-				
-                // Add object to client
-                arrBookMark.push(obj);
-            }
-        }
-    }
-    ClientData.BookMarkData(arrBookMark);
-    ClientData.MarkingData(arrMarking);
-    ClientData.MemoData(arrMemo);
-
-    return data;
-};
-*/
-
 /*
  * Extract memo data from result of API and merge with local memo
  */