ALTERNATE RECORD KEY指定時のファイルオープン処理を修正

Author: ytr-sakamoto

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

@@ -1013,7 +1013,13 @@ public void read(AbstractCobolField key, AbstractCobolField fnstatus, int read_o
 		}
 
 		if(this.organization == COB_ORG_INDEXED /* && bdb_env != null*/) {
-			//TODO INDEXED実装時
+			if(this.open_mode != COB_OPEN_I_O ||
+				(this.lock_mode & COB_LOCK_EXCLUSIVE) != 0) {
+				read_opts &= ~COB_READ_LOCK;
+			} else if((this.lock_mode & COB_LOCK_AUTOMATIC) != 0 &&
+					(read_opts & COB_READ_NO_LOCK) == 0) {
+				read_opts |= COB_READ_LOCK;
+			}
 		} else {
 			read_opts &= ~COB_READ_LOCK;
 		}
@@ -1331,7 +1337,7 @@ public static void cob_init_fileio() {
 
 	public static void defaultErrorHandle() {
 		byte[] file_status = CobolFile.errorFile.file_status;
-		int status = (file_status[0] - '0') * 10 + (file_status[0] - '0');
+		int status = (file_status[0] - '0') * 10 + (file_status[1] - '0');
 		String msg;
 		switch (status) {
 	    case COB_STATUS_10_END_OF_FILE:

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

@@ -202,7 +202,7 @@ public int open_(String filename, int mode, int sharing) {
 			}
 
 			try {
-				p.db[i] = env.openDatabase(null, filename, dbConf);
+				p.db[i] = env.openDatabase(null, runtime_buffer, dbConf);
 			} catch (OperationFailureException | EnvironmentFailureException | IllegalStateException
 					| IllegalArgumentException e) {
 				e.printStackTrace();
@@ -644,10 +644,7 @@ public int readNext(int readOpts) {
 		return COB_STATUS_00_SUCCESS;
 	}
 
-	//TODO  削除
-	public static void output_data(String msg, DatabaseEntry data) {
-		System.out.println("<<<Log>>> "+ msg + " = " + new String(new ByteArrayBinding().entryToObject(data)));
-	}
+
 	/**
 	 * libcob/fileio.cにはない関数
 	 * 複数回出現するカーソルを閉じる処理をまとめた
@@ -678,7 +675,6 @@ private int indexed_write_internal(boolean rewrite, int opt) {
 			p.write_cursor_open = true;
 			close_cursor = true;
 		}
-
 		if (this.nkeys > 1 && !rewrite) {
 			if (this.check_alt_keys(false)) {
 				if (close_cursor) {
@@ -702,10 +698,10 @@ private int indexed_write_internal(boolean rewrite, int opt) {
 
 		p.data = new DatabaseEntry(this.record.getDataStorage().getByteArray(0, this.record.getSize()));
 		try {
-			p.cursor[0].put(p.key, p.data);
+			p.cursor[0].put(p.key, p.data);			
 		} catch (LockConflictException e) {
 			return COB_STATUS_51_RECORD_LOCKED;
-		}
+		}		
 
 		p.data = p.key;
 		Put flags;

tests/cobol85/report.pl

@@ -327,45 +327,45 @@
 $skip{SG106A}=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{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;
+#$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;