[liblouis-liblouisxml] [liblouis] r730 committed - Table search stops if errors found
- From: liblouis@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Tue, 10 Jul 2012 22:57:28 +0000
Revision: 730
Author: john.boyer@xxxxxxxxxxxxxxxxx
Date: Tue Jul 10 15:57:14 2012
Log: Table search stops if errors found
http://code.google.com/p/liblouis/source/detail?r=730
Modified:
/trunk/liblouis/compileTranslationTable.c
=======================================
--- /trunk/liblouis/compileTranslationTable.c Mon Jul 9 13:34:42 2012
+++ /trunk/liblouis/compileTranslationTable.c Tue Jul 10 15:57:14 2012
@@ -4954,11 +4954,15 @@
{
/* See if table in current directory or on a path in
* the table name*/
+ if (!(errorCount == 1 && fileCount == 1))
+ return NULL;
table = getTable (tableList);
}
if (!table)
{
/* See if table on dataPath. */
+ if (!(errorCount == 1 && fileCount == 1))
+ return NULL;
pathList = lou_getDataPath ();
if (pathList)
{
@@ -4976,6 +4980,8 @@
if (!table)
{
/* See if table on installed or program path. */
+ if (!(errorCount == 1 && fileCount == 1))
+ return NULL;
#ifdef _WIN32
strcpy (trialPath, lou_getProgramPath ());
strcat (trialPath, "\\share\\liblouss\\tables\\");
@@ -4987,8 +4993,8 @@
table = getTable (trialPath);
}
if (!table)
- lou_logPrint ("%s could not be found or contains errors", tableList);
- return table;
+ lou_logPrint ("%s could not be found", tableList);
+ return NULL;
}
static unsigned char *destSpacing = NULL;
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouis] r730 committed - Table search stops if errors found - liblouis
