HuntnGather – Diff between revs 39 and 41

Subversion Repositories:

?pathlinks?

Rev 39 – Rev 42 – Go to most recent revision – Details – Blame – Last modification – View Log

 	* Writes lines from the database "dbFile" to temporary filenames "tmpNames".
 	*/
 void WriteTemporaryFiles(char *dbFile, VECTOR *tmpNames, int tmpLines, int total) {
 #if defined ___AsyncIO___
 	struct AsyncFile *fp, *tp;
-	LONG c;
 #else
 	FILE *fp, *tp;
-	char c;
 #endif
 	int lines;
 	int write;
 	int files;
+	dbLine *line = NULL;
 #if defined ___AsyncIO___
 	if((fp = OpenAsync(dbFile, MODE_READ, ASYNC_BUF)) == NULL) {
 #else
 		fprintf(stdout, "Writing to temporary files...\r");
+	}
 	write = 0;
-	lines = 0;
-#if defined ___AsyncIO___
-	while(PROGRAM_RUN && (c = ReadCharAsync(fp)) != -1) {
+	lines = 0;
-#else
-	while(PROGRAM_RUN && fscanf(fp, "%c", &c) == 1) {
-#endif
+	while(PROGRAM_RUN && (line = ReadLine(fp)) != NULL) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
+		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
+			free(line->string);
+			free(line);
+			line = NULL;
 		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			PROGRAM_RUN = FALSE;
 			continue;
+		}
-#endif
-		switch(c) {
-			case '\n':
-				// Increment the total written lines.
-				++write;
-				if(PROGRAM_VERBOSE) {
-					fprintf(stdout, "Writing to temporary files: %d%%.\r", (int)(((float)write / total) * 100.0));
-				}
 #endif
-				// Write the newline character back.
+#if defined ___AsyncIO___
-#if defined ___AsyncIO___
+		WriteAsync(tp, line->string, (LONG)line->length);
-				if(WriteCharAsync(tp, (UBYTE)c) != 1) {
+		WriteAsync(tp, "\n", 1);
 #else
-				if(fprintf(tp, "%c", c) != 1) {
-#endif
-					fprintf(stderr, "Unable to write to '%s'.\n", (char *)tmpNames->array[files]);
-#if defined ___AsyncIO___
-					CloseAsync(tp);
-					CloseAsync(fp);
-#else
-					fclose(tp);
-					fclose(fp);
-#endif
-					return;
-				}
-				// Switch to the next temporary file.
-				if(++lines >= tmpLines) {
-					// If there are no temporary files left then run till the end.
-					if(files - 1 < 0) {
-						break;
-					}
+		fprintf(tp, "%s\n", line->string);
-					// Close the previous temporary file and write to the next temporary file.
-#if defined ___AsyncIO___
+#endif
-					CloseAsync(tp);
-					if((tp = OpenAsync(tmpNames->array[--files], MODE_WRITE, ASYNC_BUF)) == NULL) {
+		++write;
-#else
+		if(PROGRAM_VERBOSE) {
-					fclose(tp);
+			fprintf(stdout, "Writing to temporary files: %d%%.\r", (int)(((float)write / total) * 100.0));
-					if((tp = fopen(tmpNames->array[--files], "w")) == NULL) {
+		}
-#endif
+		// Switch to the next temporary file.
-						fprintf(stderr, "Could not open '%s' for writing.\n", (char *)tmpNames->array[files]);
-#if defined ___AsyncIO___
+		if(++lines >= tmpLines) {
-						CloseAsync(fp);
-#else
+			// If there are no temporary files left then run till the end.
-						fclose(fp);
-#endif
+			if(files - 1 < 0) {
-						return;
+				free(line->string);
-					}
+				free(line);
-					lines = 0;
+				line = NULL;
-					break;
+				continue;
+			}
-				break;
+			// Close the previous temporary file and write to the next temporary file.
-			default:
+#if defined ___AsyncIO___
+			CloseAsync(tp);
-#if defined ___AsyncIO___
+			if((tp = OpenAsync(tmpNames->array[--files], MODE_WRITE, ASYNC_BUF)) == NULL) {
-				if(WriteCharAsync(tp, (UBYTE)c) != 1) {
+#else
-#else
+			fclose(tp);
-				if(fprintf(tp, "%c", c) != 1) {
+			if((tp = fopen(tmpNames->array[--files], "w")) == NULL) {
-#endif
-					fprintf(stderr, "Could not write to file '%s'.\n", (char *)tmpNames->array[files]);
+#endif
-#if defined ___AsyncIO___
+				fprintf(stderr, "Could not open '%s' for writing.\n", (char *)tmpNames->array[files]);
-					CloseAsync(tp);
-					CloseAsync(fp);
+#if defined ___AsyncIO___
-#else
+				CloseAsync(fp);
+#else
+				fclose(fp);
+#endif
-					fclose(tp);
+				free(line->string);
-					fclose(fp);
+				free(line);
-#endif
+				line = NULL;
-					return;
+				return;
+			}
+			lines = 0;
+		}
+		free(line->string);
+		free(line);
+		line = NULL;
+	}
+	if(line != NULL) {
 		free(line->string);
-				break;
+		free(line);
 		line = NULL;
+	}
+	}
+}
 /*
 	*
-	* Indexes a "path" by creating a database "dbFile".
+	* Indexes paths and adds to a database file.
 	*/
 void GatherDatabaseFiles(char *dbFile, VECTOR *paths) {
 	dbStats *stats;
 	VECTOR *tmpNames;
 	int tmpFiles;
 	int tmpLines;
+	int i;
+	int line;
+	int size;
+	// Generate the database file from the supplied paths.
+	if((stats = CollectFiles(dbFile, paths)) == NULL) {
+		fprintf(stderr, "Collecting files failed.\n");
+		return;
+	}
+	size = GetFileSize(dbFile);
+	line = CountFileLines(dbFile);
+	// Calculate the total number of temporary files required.
+	tmpFiles = size / maxmem;
+	/* In case no temporary files are required,
+	 * just sort the database and terminate.
+	 */
+	if(tmpFiles < 2) {
+		SortDatabase(dbFile, line);
+		return;
+	}
+	// Calculate the number of lines per temporary file.
+	tmpLines = ceil(((double)line) / ((double)tmpFiles));
+	// Create temporary files.
+	if((tmpNames = CreateTemporaryFiles(tmpFiles)) == NULL) {
+		fprintf(stderr, "Unable to create temporary files.\n");
+		return;
+	}
+	// Write "tmpLines" to temporary files in "tmpNames" from "dbFile".
+	WriteTemporaryFiles(dbFile, tmpNames, tmpLines, line);
+	// Sort the temporary files.
+	for(i = 0; i < tmpNames->length; ++i) {
+		SortDatabase(tmpNames->array[i], tmpLines);
+	}
+	// Merge all the temporary files to the database file.
+	MergeTemporaryFiles(dbFile, tmpNames, line);
+	// Remove all temporary files.
+	RemoveFiles(tmpNames);
+	// Free temporary file names.
+	free(tmpNames);
+	tmpNames = NULL;
+	// Free statistics.
+	free(stats);
+	stats = NULL;
+}
+/*
+	*
+	* Indexes paths and creates a daabase file.
+	*/
+void CreateDatabaseFiles(char *dbFile, VECTOR *paths) {
+	dbStats *stats;
+	VECTOR *tmpNames;
+	int tmpFiles;
+	int tmpLines;
 	int i;
 	// Generate the database file from the supplied paths.
 	if((stats = CollectFiles(dbFile, paths)) == NULL) {
  		case CREATE:
  			if(PROGRAM_VERBOSE) {
  				fprintf(stdout, "Removing '%s' and creating a new database.\n", dbFile);
+ 			}
  			RemoveFile(dbFile);
+ 			if(PROGRAM_VERBOSE) {
+ 				fprintf(stdout, "Gathering files to database...\n");
+ 			}
+ 			CreateDatabaseFiles(dbFile, paths);
+ 			break;
  		case GATHER:
  			if(PROGRAM_VERBOSE) {
  				fprintf(stdout, "Gathering files to database...\n");
+ 			}
  			GatherDatabaseFiles(dbFile, paths);
  			fprintf(stderr, "Unknown operation.\n");
 			#if defined ___AmigaOS___
 				CloseLocale(locale);
 			#endif
 			free(paths->array);
  			free(paths);
  			paths = NULL;
  			return 5;
+ 	}
 #if defined ___AmigaOS___
+	CloseLocale(locale);
+#endif
-	CloseLocale(locale);
-#endif
+	if(paths != NULL) {
+		free(paths->array);
+ 		free(paths);
  		paths = NULL;
  	free(paths);