INDEXEDに関する修正(暫定)

Author: ytr-sakamoto

libcobj/src/jp/osscons/opensourcecobol/libcobj/file/CobolFile.java

@@ -1084,7 +1084,6 @@ public void write(AbstractCobolField rec, int opt, AbstractCobolField fnstatus)
 				|| this.open_mode == COB_OPEN_INPUT
 				|| this.open_mode == COB_OPEN_EXTEND) {
 				saveStatus(COB_STATUS_48_OUTPUT_DENIED, fnstatus);
-				System.err.println("write called 03-2");
 				return;
 			}
 		}

libcobj/src/jp/osscons/opensourcecobol/libcobj/file/CobolIndexedFile.java

@@ -186,8 +186,11 @@ public int open_(String filename, int mode, int sharing) {
 			} else {
 				dbConf.setAllowCreate(true);
 			}
-
-			dbConf.setSortedDuplicates(this.keys[i].getFlag() != 0);
+			/*if(this.keys[i].getFlag() != 0) {
+				dbConf.setSortedDuplicates(true);
+			}*/
+			//dbConf.setSortedDuplicates(this.keys[i].getFlag() != 0);
+			dbConf.setSortedDuplicates(true);
 
 			if (mode == COB_OPEN_OUTPUT) {
 				try {
@@ -586,11 +589,7 @@ public int readNext(int readOpts) {
 			}
 			if (read_nextprev) {
 				try {
-					//output_data("22222 p.key", p.key);
-					//System.out.println("<<<Log>>> p.key_index = " + p.key_index);
 					result = p.cursor[p.key_index].get(p.key, p.data, nextprev, readOptions);
-					//output_data("33333 p.key", p.key);
-					//output_data("33333 p.data", p.data);
 				} catch(LockConflictException e) {
 					this.discardCursors(p);
 					return COB_STATUS_51_RECORD_LOCKED;
@@ -628,7 +627,6 @@ public int readNext(int readOpts) {
 			}
 			if (p.key_index == 0) {
 				p.last_readkey[0].memcpy(p.key.getData(), p.key.getSize());
-				//output_data("xxxxxx p.key", p.key);
 			} else {
 				p.last_readkey[p.key_index].memcpy(p.temp_key, this.keys[p.key_index].getField().getSize());
 				p.last_readkey[p.key_index + this.nkeys].memcpy(p.key.getData(),
@@ -703,8 +701,6 @@ private int indexed_write_internal(boolean rewrite, int opt) {
 		}
 
 		p.data = new DatabaseEntry(this.record.getDataStorage().getByteArray(0, this.record.getSize()));
-		//output_data("write 0 p.key", p.key);
-		//output_data("write 0 p.data", p.data);
 		try {
 			p.cursor[0].put(p.key, p.data);
 		} catch (LockConflictException e) {
@@ -728,8 +724,6 @@ private int indexed_write_internal(boolean rewrite, int opt) {
 			}
 
 			p.key = DBT_SET(this.keys[i].getField());
-			//output_data("write " + i + " p.key", p.key);
-			//output_data("write " + i + " p.data", p.data);
 			try {
 				if(p.db[i].put(null, p.key, p.data, flags, null) == null) {
 					if (close_cursor) {
@@ -799,9 +793,9 @@ public int write_(int opt) {
 	private boolean check_alt_keys(boolean rewrite) {
 		IndexedFile p = this.filei;
 		for (int i = 1; i < this.nkeys; ++i) {
-			if (this.keys[i].getFlag() != 0) {
+			if (this.keys[i].getFlag() == 0) {
 				p.key = DBT_SET(this.keys[i].getField());
-				if (p.db[i].get(null, p.key, p.data, Get.SEARCH, null) == null) {
+				if (p.db[i].get(null, p.key, p.data, Get.SEARCH, null) != null) {
 					if (rewrite) {
 						byte[] dataBytes = p.data.getData();
 						if (this.keys[0].getField().getDataStorage().memcmp(dataBytes,
@@ -849,10 +843,10 @@ private int get_dupno(int i) {
 		//berkley dbの重複スキーに対するデータは新しいものほど先頭に格納されるが
 		//java editionでは挿入位置が自動で設定されるため,以下の実装を変えた.
 		int dupno = 0;
-		while (ret != null) {
-			int tempDupno = ByteBuffer.wrap(p.key.getData(), this.keys[0].getField().getSize(), 4).getInt();
-			if (tempDupno > dupno) {
-				dupno = tempDupno;
+		while (ret != null && p.temp_key.memcmp(p.key.getData(), p.key.getSize()) == 0) {
+			int tempdupno = ByteBuffer.wrap(p.data.getData(), this.keys[0].getField().getSize(), 4).getInt();
+			if(dupno < tempdupno) {
+				dupno = tempdupno;
 			}
 			ret = p.cursor[i].get(p.key, p.data, Get.NEXT_DUP, null);
 		}
@@ -861,7 +855,7 @@ private int get_dupno(int i) {
 		p.cursor[i] = null;
 
 		return ++dupno;
-	}
+	}	
 
 	@Override
 	/**

tests/cobol85/report.pl

@@ -97,7 +97,7 @@
 $skip{NC124A} = 1;
 $skip{NC125A} = 1;
 $skip{NC126A} = 1;
-$skip{NC127A} = 1;
+#$skip{NC127A} = 1;
 $skip{NC131A} = 1;
 $skip{NC132A} = 1;
 $skip{NC133A} = 1;
@@ -113,7 +113,7 @@
 $skip{NC171A} = 1;
 $skip{NC172A} = 1;
 $skip{NC173A} = 1;
-#$skip{NC174A} = 1;
+$skip{NC174A} = 1;
 $skip{NC175A} = 1;
 $skip{NC176A} = 1;
 $skip{NC177A} = 1;
@@ -325,7 +325,47 @@
 $skip{SG104A}=1;
 $skip{SG105A}=1;
 $skip{SG106A}=1;
-#$skip{SG204A}=1;
+$skip{SG204A}=1;
+
+#$skip{IX101A}=1;
+#$skip{IX102A}=1;
+#$skip{IX103A}=1;
+#$skip{IX104A}=1;
+#$skip{IX105A}=1;
+#$skip{IX106A}=1;
+#$skip{IX107A}=1;
+#$skip{IX108A}=1;
+#$skip{IX109A}=1;
+#$skip{IX110A}=1;
+#$skip{IX111A}=1;
+#$skip{IX112A}=1;
+#$skip{IX113A}=1;
+#$skip{IX114A}=1;
+#$skip{IX115A}=1;
+#$skip{IX116A}=1;
+#$skip{IX117A}=1;
+#$skip{IX118A}=1;
+#$skip{IX119A}=1;
+#$skip{IX120A}=1;
+#$skip{IX121A}=1;
+#$skip{IX201A}=1;
+#$skip{IX202A}=1;
+#$skip{IX203A}=1;
+#$skip{IX204A}=1;
+#$skip{IX205A}=1;
+#$skip{IX206A}=1;
+#$skip{IX207A}=1;
+#$skip{IX208A}=1;
+#$skip{IX209A}=1;
+#$skip{IX210A}=1;
+#$skip{IX211A}=1;
+#$skip{IX212A}=1;
+#$skip{IX213A}=1;
+#$skip{IX214A}=1;
+#$skip{IX215A}=1;
+#$skip{IX216A}=1;
+#$skip{IX217A}=1;
+#$skip{IX218A}=1;
 
 
 open (LOG, "> report.txt") or die;