diff --git a/DIC_2521A.json b/DIC_2521A.json index 5c74bdd..b33d479 100644 --- a/DIC_2521A.json +++ b/DIC_2521A.json @@ -158,18 +158,18 @@ }, "2": { "1": { - "ele": "//CRClipArr/CRClip[position() = //CRTrackList[1]/CRTrackClip/@ClipIndex]/@Path", - "type": "array", + "ele": "//CRClipArr/CRClip[position() = //CRTrackList[1]/CRTrackClip/@ClipIndex]/@Path", + "type": "array", "value": [ - "동영상.mp4", - "이미지2.jpg", - "이미지3.jpg", - "이미지1.jpg" - ], + "동영상.mp4", + "이미지2.jpg", + "이미지3.jpg", + "이미지1.jpg" + ], "point": 4 }, "2": { - "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[1][@Speed='130']", + "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[@ClipIndex != '-1'][1][@Speed='130']", "point": 2 }, "3": { @@ -253,7 +253,7 @@ }, "15": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "19", "460:520", @@ -279,7 +279,7 @@ }, "18": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "14", "610:670", @@ -305,7 +305,7 @@ }, "21": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "0", "760:820", @@ -320,36 +320,36 @@ }, "23": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID102='돋움체']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID102='돋움체']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID102='돋움체']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 2 }, "24": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID101='160']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID101='160']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID101='160']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 2 }, "25": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 2 }, "26": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 2 }, "27": { "ele": "//CRCUnitArr[@Name='{search}'][@VID505='18'][@VID507='2']", - "ele2": "//CROwneUnit[2]/CRCUnitArr[@VID505='18'][@VID507='2']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]/CRCUnitArr[@VID505='18'][@VID507='2']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 3 }, "28": { - "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='{search}']]/preceding::CROwneUnit)][@Pos='0']", + "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[1][@ClipLength - @Length = @Pos]", "ele2": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[2]/CRCUnitArr/preceding::CROwneUnit)][@Pos='0']", "search": "공존하는 개와 양 (Dog and sheep)", "point": 2 diff --git a/DIC_2521A_result.xlsx b/DIC_2521A_result.xlsx index b105ff0..d2873b0 100644 Binary files a/DIC_2521A_result.xlsx and b/DIC_2521A_result.xlsx differ diff --git a/DIC_2521B.json b/DIC_2521B.json index 881a15d..9e00950 100644 --- a/DIC_2521B.json +++ b/DIC_2521B.json @@ -171,7 +171,7 @@ "point": 4 }, "2": { - "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[1][@Speed='130']", + "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[@ClipIndex != '-1'][1][@Speed='130']", "point": 2 }, "3": { @@ -246,16 +246,16 @@ }, "14": { "type": "multi", - "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]//CRFilter/@VID100", + "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]//CRFilter/@VID101", "value": [ "94", - "50" + "10" ], "point": 2 }, "15": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "32", "440:500", @@ -281,7 +281,7 @@ }, "18": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "19", "620:650", @@ -307,7 +307,7 @@ }, "21": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "0", "770:830", @@ -322,36 +322,36 @@ }, "23": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID102='휴먼옛체']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID102='휴먼옛체']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID102='휴먼옛체']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "24": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "25": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='4'][@VID100='-1589535']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "26": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='2'][@VID100='0.2'][@VID101='-8510694']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "27": { "ele": "//CRCUnitArr[@Name='{search}'][@VID505='3'][@VID507='2']", - "ele2": "//CROwneUnit[2]/CRCUnitArr[@VID505='3'][@VID507='2']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]/CRCUnitArr[@VID505='3'][@VID507='2']", "search": "초록빛 이파리들 Green leaves", "point": 3 }, "28": { - "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='{search}']]/preceding::CROwneUnit)][@Pos='0']", + "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[1][@ClipLength - @Length = @Pos]", "ele2": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[2]/CRCUnitArr/preceding::CROwneUnit)][@Pos='0']", "search": "초록빛 이파리들 Green leaves", "point": 2 diff --git a/DIC_2521B_result.xlsx b/DIC_2521B_result.xlsx new file mode 100644 index 0000000..14e7f1f Binary files /dev/null and b/DIC_2521B_result.xlsx differ diff --git a/DIC_2521C.json b/DIC_2521C.json index 9d080e0..e758f4e 100644 --- a/DIC_2521C.json +++ b/DIC_2521C.json @@ -169,7 +169,7 @@ "point": 4 }, "2": { - "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[1][@Speed='130']", + "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[@ClipIndex != '-1'][1][@Speed='130']", "point": 2 }, "3": { @@ -244,16 +244,16 @@ }, "14": { "type": "multi", - "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@VID100", + "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@VID102", "value": [ "103", - "100" + "8" ], "point": 2 }, "15": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "10", "450:480", @@ -279,7 +279,7 @@ }, "18": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "19", "660:690", @@ -296,16 +296,16 @@ }, "20": { "type": "multi", - "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@VID100", + "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@VID103", "value": [ "96", - "50" + "10" ], "point": 2 }, "21": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "0", "780:840", @@ -320,36 +320,36 @@ }, "23": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID102='궁서체']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID102='궁서체']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID102='궁서체']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "24": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID101='150']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID101='150']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID101='150']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "25": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='4'][@VID100='-14592003']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='4'][@VID100='-14592003']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='4'][@VID100='-14592003']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "26": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-3868161']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-3868161']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-3868161']", "search": "초록빛 이파리들 Green leaves", "point": 2 }, "27": { "ele": "//CRCUnitArr[@Name='{search}'][@VID505='4'][@VID507='2']", - "ele2": "//CROwneUnit[2]/CRCUnitArr[@VID505='4'][@VID507='2']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]/CRCUnitArr[@VID505='24'][@VID507='2']", "search": "초록빛 이파리들 Green leaves", "point": 3 }, "28": { - "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='{search}']]/preceding::CROwneUnit)][@Pos='0']", + "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[1][@ClipLength - @Length = @Pos]", "ele2": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[2]/CRCUnitArr/preceding::CROwneUnit)][@Pos='0']", "search": "초록빛 이파리들 Green leaves", "point": 2 diff --git a/DIC_2521C_result.xlsx b/DIC_2521C_result.xlsx new file mode 100644 index 0000000..a63abb6 Binary files /dev/null and b/DIC_2521C_result.xlsx differ diff --git a/DIC_2521D.json b/DIC_2521D.json index 874623c..d7ce7c9 100644 --- a/DIC_2521D.json +++ b/DIC_2521D.json @@ -171,7 +171,7 @@ "point": 4 }, "2": { - "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[1][@Speed='120']", + "ele": "/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[@ClipIndex != '-1'][1][@Speed='120']", "point": 2 }, "3": { @@ -246,16 +246,16 @@ }, "14": { "type": "multi", - "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@VID100", + "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@VID102", "value": [ "173", - "0" + "160" ], "point": 2 }, "15": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "32", "520:550", @@ -272,16 +272,16 @@ }, "17": { "type": "multi", - "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@VID101", + "ele": "//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]//CRFilter/@VID102", "value": [ "103", - "10" + "8" ], "point": 2 }, "18": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "8", "670:700", @@ -307,7 +307,7 @@ }, "21": { "type": "multi", - "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type", + "ele": "//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']//preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@Type", "value": [ "19", "790:880", @@ -320,38 +320,38 @@ "search": "젖소와 함께한 시간 With milk cow", "point": 3 }, - "23": { + "23": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID102='굴림체']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID102='굴림체']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID102='굴림체']", "search": "젖소와 함께한 시간 With milk cow", "point": 2 }, "24": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool[@Type='1']/GCUnit[@VID101='140']", "search": "젖소와 함께한 시간 With milk cow", "point": 2 }, "25": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='4'][@VID100='-14982578']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='4'][@VID100='-14982578']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='4'][@VID100='-14982578']", "search": "젖소와 함께한 시간 With milk cow", "point": 2 }, "26": { "ele": "//CRCUnitArr[@Name='{search}']//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-5511709']", - "ele2": "//CROwneUnit[2]/CRCUnitArr//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-5511709']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]//GCUnitPool/GCUnit[@Type='2'][@VID100='0.30000001'][@VID101='-5511709']", "search": "젖소와 함께한 시간 With milk cow", "point": 2 }, "27": { "ele": "//CRCUnitArr[@Name='{search}'][@VID505='24'][@VID507='2']", - "ele2": "//CROwneUnit[2]/CRCUnitArr[@VID505='24'][@VID507='2']", + "ele2": "//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]/CRCUnitArr[@VID505='24'][@VID507='2']", "search": "젖소와 함께한 시간 With milk cow", "point": 3 }, "28": { - "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='{search}']]/preceding::CROwneUnit)][@Pos='0']", + "ele": "//CRTrackList[@Name='텍스트']/CRTrackClip[1][@ClipLength - @Length = @Pos]", "ele2": "//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[2]/CRCUnitArr/preceding::CROwneUnit)][@Pos='0']", "search": "젖소와 함께한 시간 With milk cow", "point": 2 diff --git a/DIC_2521D_result.xlsx b/DIC_2521D_result.xlsx new file mode 100644 index 0000000..d73e388 Binary files /dev/null and b/DIC_2521D_result.xlsx differ diff --git a/README.md b/README.md index 5758ab8..a5e8378 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,39 @@ xpath 테스트 용 * 이미지 클립 트랜지션 항목 Range 끝점과 시작점 차이로 길이 계산하도록 변경 +5. CRTrackClip + * Type="0" ClipIndex="-1" : 공백 + * + 5. todo * 자막 위치 검사하는 로직 원복 * 파일 명 split 해서 최대한 채점 파일 추려내기 * 이미지 클립 트랜지션 항목 Range 끝점과 시작점 차이로 길이 계산하도록 변경 + +>> 곰믹스-B형-001551-이정우 + * 이미지2.jpg-클립 트랜지션 (완료) + 요부분도..맞는데 오답처리되어있네요! + +>> 곰믹스B형-001393-우주원 + * 텍스트 틀렸는데 텍스트 점수가 정답으로 들어감 (완료) + +>> C형-000250-안윤 +이친구도 동영상이 0.0에서 시작하는게 아니라서 그런지 배속이 틀렸다고 되어있긴합니다..ㅎㅎ (완료) + * 앞에 공백구간이 있을경우 CRTrackClip[1] 태그가 공백구간에 해당되서 + xpath구문에 공백구간 제외하도록 변경 + +>> 곰믹스-C형-005205-황채미 +이미지3의 오버레이(내려앉는:속도8) +=>속도5로 되어있는데 정답으로 됨 +요부분도 같이 확인부탁드릴게요수치가 잘못 체크된건지..ㅎㅎ (완료) + * 속성값 검색하는 구문 수정완료 + +>> 곰믹스-B형-001551-이정우 +자막(연못의 연잎들) 시작시간(5.10) (완료) + * 자막 클립 리스트 중 1번, 2번 길이를 합한 길이로 채점 + +>> 곰믹스-B형-003340-이안나 +'초록빛 이파리들...'자막 시작시간 오답처리 (완료) + * 자막 클립의 앞이 잘리게 되면 트림시간이 생성되어 CRTrackClip태그의 속성값들이 변경 됨 + * CRTrackClip 태그 ClipLength, Length, Pos 속성값 비교 연산 필요 + * ClipLength - Length = Pos \ No newline at end of file diff --git a/psdExport_2.js b/psdExport_2.js index 3a5adb5..fd3ae66 100644 --- a/psdExport_2.js +++ b/psdExport_2.js @@ -9,10 +9,10 @@ const { DOMParser } = require('xmldom'); const findSimilarString = require('./findSimilarString'); // -------------------------------------------------------- -const scoringJson = require('./DIC_2521A.json'); +// const scoringJson = require('./DIC_2521A.json'); // const scoringJson = require('./DIC_2521B.json'); // const scoringJson = require('./DIC_2521C.json'); -// const scoringJson = require('./DIC_2521D.json'); +const scoringJson = require('./DIC_2521D.json'); // TEST // const scoringJson = require('./DIC_2521A_TEST.json'); @@ -20,10 +20,10 @@ const scoringJson = require('./DIC_2521A.json'); // const scoringJson = require('./DIC_2521C_TEST.json'); // const scoringJson = require('./DIC_2521D_TEST.json'); // -------------------------------------------------------- -const answerFilesDir = './output/A/DIC'; +// const answerFilesDir = './output/A/DIC'; // const answerFilesDir = './output/B/DIC'; // const answerFilesDir = './output/C/DIC'; -// const answerFilesDir = './output/D/DIC'; +const answerFilesDir = './output/D/DIC'; // TEST // const answerFilesDir = './output/A/TEST'; @@ -32,10 +32,10 @@ const answerFilesDir = './output/A/DIC'; // const answerFilesDir = './output/D/TEST'; // -------------------------------------------------------- -const outputExcelFile = './DIC_2521A_result.xlsx'; +// const outputExcelFile = './DIC_2521A_result.xlsx'; // const outputExcelFile = './DIC_2521B_result.xlsx'; // const outputExcelFile = './DIC_2521C_result.xlsx'; -// const outputExcelFile = './DIC_2521D_result.xlsx'; +const outputExcelFile = './DIC_2521D_result.xlsx'; // TEST // const outputExcelFile = './DIC_2521A_TEST.xlsx'; @@ -141,6 +141,7 @@ function getGmepScore(gmepData, scoringJson, index) { // 채점기준표 문항별 분류 for (const key in scoringData) { let ele = scoringData[key].ele; + const ele2 = scoringData[key].ele2; let existEle = scoringData[key].existEle; const rightAnswer = scoringData[key].value; const point = scoringData[key].point; @@ -156,7 +157,7 @@ function getGmepScore(gmepData, scoringJson, index) { * > 멀티라인 텍스트 유사도 판별하기 어려움 */ if (search !== undefined) { - let result = findSimilarString(gmepXmlDoc, search, 0.2) + let result = findSimilarString(gmepXmlDoc, search, 1.0) ele = ele.replace(/{search}/g, result); if ( existEle !== undefined ){ existEle = existEle.replace(/{search}/g, result); @@ -185,7 +186,8 @@ function getGmepScore(gmepData, scoringJson, index) { if (trackListNode) { // CRTrackClip 요소의 ClipIndex를 참조하여 CRClip 요소의 Path와 Type 출력 - const clipIndexes = xpath.select('CRTrackClip[not(@Type="0")]/@ClipIndex', trackListNode); + const clipIndexes = xpath.select('CRTrackClip[@ClipIndex!="-1"][@Length!="1"]/@ClipIndex' + , trackListNode); clipIndexes.forEach(indexNode => { const clipIndex = parseInt(indexNode.value, 10) + 1; // XPath는 1-based index를 사용 console.log(`clipIndex: ${clipIndex}`); @@ -202,7 +204,7 @@ function getGmepScore(gmepData, scoringJson, index) { values.push(clipPathNode.value); }); // values에 값이 있는지 확인 - if (values.length == 0) { + if (values.length == 0 || values.length < 4) { console.log('values length 0'); scoringResult[key] = 0; continue; @@ -278,12 +280,15 @@ function getGmepScore(gmepData, scoringJson, index) { else if (type == "range") { const start = scoringData[key].start; const end = scoringData[key].end; - + try{ - const result = xpath.select(ele, gmepXmlDoc); + let result = xpath.select(ele, gmepXmlDoc); if (result.length == 0) { - scoringResult[key] = 0; - continue; + result = xpath.select(ele2, gmepXmlDoc); + if (result.length == 0 ) { + scoringResult[key] = 0; + continue; + } } // 수험자 답안 자막 좌표 (x,y) @@ -386,12 +391,18 @@ function getGmepScore(gmepData, scoringJson, index) { } else { console.log(`not found. ${existEle} `); - scoringResult[key] = 0; + const result = xpath.select1(ele, gmepXmlDoc); + console.log("🚀 ~ getGmepScore ~ result:", result) + if ( result == rightAnswer ) { + totalScore += point; + scoringResult[key] = point; + } + else { + scoringResult[key] = 0; + } } } else { - const ele2 = scoringData[key].ele2; - console.log('Unknown type:', ele); let result = xpath.select(ele, gmepXmlDoc); let result2 = null; diff --git a/z.xbook b/z.xbook index ef9f35c..0281efe 100644 --- a/z.xbook +++ b/z.xbook @@ -1 +1 @@ -[{"kind":1,"language":"markdown","value":"# XPath Notebook\r\nDate: 2025-02-04     Time: 17:56:45"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='동영상.mp4']/preceding-sibling::*)]//CRFilter[@ID='86'][@VID100='6'][@VID101='30']"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[(@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='연못의 연잎들']]/preceding::CROwneUnit))][@Length='120']"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='초록빛 이파리들 Green leaves']]/preceding::CROwneUnit)][@Pos='0']"},{"kind":2,"language":"xpath","value":"//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range"},{"kind":2,"language":"xpath","value":"\r\n//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"/CRTrackClip[][@Length='120']"},{"kind":2,"language":"xpath","value":"(@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='재미있는 놀이공원']/preceding::CROwneUnit))"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[(@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='재미있는 놀이공원']]/preceding::CROwneUnit))][@Length='120']"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[(@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='재미있는 놀이공원']]/preceding::CROwneUnit))][@Length='120']"},{"kind":2,"language":"xpath","value":"//CRCUnitArr/@Name"},{"kind":2,"language":"xpath","value":"//GPStrLineArr//GPString/@VID7"},{"kind":2,"language":"xpath","value":"sum(//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]/@Length)"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]"},{"kind":2,"language":"xpath","value":"//CRCUnitArr[@Name='재미있는 놀이공원']/@VID600 | //CRCUnitArr[@Name='재미있는 놀이공원']/@VID601"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/@Length"},{"kind":2,"language":"xpath","value":"//CRCUnitArr[@Name='재미있는 놀이공원']/@VID600 | //CRCUnitArr[@Name='재미있는 놀이공원']/@VID601"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTrackClip[@ClipIndex=1]/preceding-sibling::CRTrackClip"},{"kind":2,"language":"xpath","value":"count(//CRTrackList/CRTrackClip[1]/preceding-sibling::CRTrackClip)"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[1]/preceding-sibling::CRTrackClip"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[1]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=2]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=2]/preceding-sibling::CRTrackClip"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=2]"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=2]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=2]"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지1.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTrackClip[not(@Type='0')]/@ClipIndex"}] \ No newline at end of file +[{"kind":1,"language":"markdown","value":"# XPath Notebook\r\nDate: 2025-02-04     Time: 17:56:45"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Range|//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@Type='2' and @ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@Type"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)"},{"kind":2,"language":"xpath","value":"//CRVideoTrackArr/CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex!='-1']/@ClipIndex"},{"kind":2,"language":"xpath","value":"//CRVideoTrackArr/CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex!='-1']/@ClipIndex"},{"kind":2,"language":"xpath","value":"(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=3])[1]/preceding-sibling::CRTrackClip"},{"kind":2,"language":"xpath","value":"count((//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=3])[1]/preceding-sibling::CRTrackClip)"},{"kind":2,"language":"xpath","value":"//CRTransFilter[@ClipIndex=count(//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지2.jpg']/preceding-sibling::*)][1]/preceding-sibling::CRTrackClip)]/@ID"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]"},{"kind":2,"language":"xpath","value":"sum(//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]/@Length)"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[2]/CRCUnitArr/preceding::CROwneUnit))]/@Length"},{"kind":2,"language":"xpath","value":"sum(//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[2]/preceding-sibling::CROwneUnit))]/@Length)"},{"kind":2,"language":"xpath","value":"//CROwneUnit[2]/preceding-sibling::CROwneUnit"},{"kind":2,"language":"xpath","value":"//CROwneUnit[2]/CRCUnitArr"},{"kind":2,"language":"xpath","value":"/CROASTERP/CRTrackArr[1]/CRVideoTrackArr[1]/CRTrackList[1]/CRTrackClip[@ClipIndex != '-1'][1][@Speed='120']"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@ID |//CRTrackList[@Name='비디오1']/CRTrackClip[@ClipIndex=count(//CRClip[@Path='이미지3.jpg']/preceding-sibling::*)]//CRFilter/@VID100"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex='-1')][@ClipLength - @Length = @Pos]"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[@ClipIndex=count(//CROwneUnit[.//CRCUnitArr[@Name='젖소와 함께한 시간 With milk cow']]/preceding::CROwneUnit)][@ClipLength - @Length = @Pos]"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']/CRTrackClip[1][@ClipLength - @Length = @Pos]"},{"kind":2,"language":"xpath","value":"sum(//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]/@Length)"},{"kind":2,"language":"xpath","value":"//CROwneUnitArr/CROwneUnit[//CRTrackList[@Name='텍스트']//CRTrackClip[position()=1]/@ClipIndex+1]"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name='텍스트']//CRTrackClip[1]/@ClipIndex+1"},{"kind":2,"language":"xpath","value":"//CRClipArr/CRClip[position() = //CRVideoTrackArr/CRTrackList[1]/CRTrackClip/@ClipIndex]/@Path"},{"kind":2,"language":"xpath","value":"//CRClipArr/CRClip[position()=[0,4,3,2]]"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex != \"-1\" or @ClipLength != \"-1\"]/@ClipIndex"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex >= 0 and @ClipIndex <= 4]/@ClipIndex"},{"kind":2,"language":"xpath","value":"//CRTrackList[@Name=\"비디오1\"]/CRTrackClip[@ClipIndex != \"-1\"]/@ClipIndex"},{"kind":2,"language":"xpath","value":"sum(//CRTrackList[@Name='텍스트']/CRTrackClip[not(@ClipIndex=count(//CROwneUnit[1]/CRCUnitArr/preceding::CROwneUnit))]/@Length)"}] \ No newline at end of file diff --git a/회차별채점자료/2521/Excel_채점결과/DIC_2521C_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0215_DIC_2521C_result.xlsx similarity index 100% rename from 회차별채점자료/2521/Excel_채점결과/DIC_2521C_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0215_DIC_2521C_result.xlsx diff --git a/회차별채점자료/2521/Excel_채점결과/DIC_2521D_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0215_DIC_2521D_result.xlsx similarity index 100% rename from 회차별채점자료/2521/Excel_채점결과/DIC_2521D_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0215_DIC_2521D_result.xlsx diff --git a/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521A_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521A_result.xlsx new file mode 100644 index 0000000..1a3df2f Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521A_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521B_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521B_result.xlsx new file mode 100644 index 0000000..150bd68 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521B_result.xlsx differ diff --git a/0217_DIC_2521C_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521C_result.xlsx similarity index 97% rename from 0217_DIC_2521C_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0218_DIC_2521C_result.xlsx index ff297eb..2094966 100644 Binary files a/0217_DIC_2521C_result.xlsx and b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521C_result.xlsx differ diff --git a/0217_DIC_2521D_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521D_result.xlsx similarity index 96% rename from 0217_DIC_2521D_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0218_DIC_2521D_result.xlsx index 17118d5..3b1a631 100644 Binary files a/0217_DIC_2521D_result.xlsx and b/회차별채점자료/2521/Excel_채점결과/0218_DIC_2521D_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521A_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521A_result.xlsx new file mode 100644 index 0000000..d2873b0 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521A_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521B_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521B_result.xlsx new file mode 100644 index 0000000..14e7f1f Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521B_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521C_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521C_result.xlsx new file mode 100644 index 0000000..a63abb6 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521C_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521D_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521D_result.xlsx new file mode 100644 index 0000000..d73e388 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219(2)_DIC_2521D_result.xlsx differ diff --git a/0217_DIC_2521A_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521A_result.xlsx similarity index 98% rename from 0217_DIC_2521A_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0219_DIC_2521A_result.xlsx index 09ee42e..2d081a9 100644 Binary files a/0217_DIC_2521A_result.xlsx and b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521A_result.xlsx differ diff --git a/0217_DIC_2521B_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521B_result.xlsx similarity index 96% rename from 0217_DIC_2521B_result.xlsx rename to 회차별채점자료/2521/Excel_채점결과/0219_DIC_2521B_result.xlsx index 59ffd88..52eb96a 100644 Binary files a/0217_DIC_2521B_result.xlsx and b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521B_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521C_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521C_result.xlsx new file mode 100644 index 0000000..68c0107 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521C_result.xlsx differ diff --git a/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521D_result.xlsx b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521D_result.xlsx new file mode 100644 index 0000000..3b1a631 Binary files /dev/null and b/회차별채점자료/2521/Excel_채점결과/0219_DIC_2521D_result.xlsx differ