Changeset 632

Timestamp:

Mar 5, 2010, 1:38:54 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty/clucene: Made it build in _ASCII mode.

Location:

trunk

Files:

• src/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp (modified) (3 diffs)
• src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp (modified) (3 diffs)
• src/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp (modified) (2 diffs)
• src/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp (modified) (3 diffs)
• src/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qclucene_global_p.h (modified) (3 diffs)

trunk/src/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp

@@ -11 +11 @@
 #include "CLucene/util/Misc.h"
 
+
+
 CL_NS_USE(store)
 CL_NS_USE(util)
@@ -72 +74 @@
             int64_t offset = stream->readLong();
             int32_t read = stream->readString(tid, CL_MAX_PATH);
-            QString aid(QString::fromWCharArray(tid, read));
+            QString aid);
 
             // set length of the previous entry
@@ -294 +296 @@
                 fe->directoryOffset = os->getFilePointer();
                 os->writeLong(0);    // for now
-                tfile[fe->file.toWCharArray(tfile)] = '\0';
+                tfile[tfile)] = '\0';
                 os->writeString(tfile, _tcslen(tfile));
             }

trunk/src/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp

@@ -17 +17 @@
 #include "SegmentInfos.h"
 #include "SegmentMerger.h"
+
+
 
 CL_NS_USE(store)
@@ -473 +475 @@
         for (int32_t i = input->readInt(); i > 0; i--) {
             int32_t read = input->readString(tname, CL_MAX_PATH);
-            result.push_back(QString::fromWCharArray(tname, read));
+            result.push_back((tname, read));
         }
     } _CLFINALLY (
@@ -516 +518 @@
         QStringList::const_iterator itr;
         for (itr  = files.begin(); itr != files.end(); ++itr) {
-            tfile[(*itr).toWCharArray(tfile)] = '\0';
+            tfile[tfile)] = '\0';
             output->writeString(tfile, _tcslen(tfile));
         }

trunk/src/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp

@@ -12 +12 @@
 #include "CLucene/store/Directory.h"
 #include "CLucene/util/Misc.h"
+
+
 
 CL_NS_USE(store)
@@ -207 +209 @@
 
                 //Write the name of the current segment
-                int32_t count = si->name.toWCharArray(tname);
+                int32_t count = tname);
                 tname[count] = '\0';
                 output->writeString(tname, _tcslen(tname));

trunk/src/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp

@@ -217 +217 @@
     }
 
-    //Reposition current term in the enumeration 
-    seekEnum(getIndexOffset(term));
-    //Return the TermInfo for term
-    return scanEnum(term);
+    //Reposition current term in the enumeration
+    int32_t indexOffset = getIndexOffset(term);
+    if (indexOffset >= 0) {
+        seekEnum(getIndexOffset(term));
+        //Return the TermInfo for term
+        return scanEnum(term);
+    }
+
+    // term not found
+    return NULL;
 }
 
@@ -238 +244 @@
     //Retrieve the indexOffset for term
     int32_t indexOffset = getIndexOffset(term);
+
+
+
     seekEnum(indexOffset);
 
@@ -339 +348 @@
     //Pre  - term holds a reference to a valid term
     //       indexTerms != NULL
-    //Post - The new offset has been returned
+    //Post - The new offset has been returned
 
     //Check if is indexTerms is a valid array

trunk/src/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp

@@ -19 +19 @@
 #include "CLucene/debug/condition.h"
 
+
+
 CL_NS_DEF(store)
 CL_NS_USE(util)
@@ -560 +562 @@
 
     TCHAR tBuffer[2048] = { 0 };
-    dirName.toWCharArray(tBuffer);
+    tBuffer);
     
     char aBuffer[4096] = { 0 };

trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h

@@ -37 +37 @@
 #include <QtCore/QString>
 
-#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+#if !defined(_MSC_VER)
 #   if !defined(TCHAR)
-#       define TCHAR wchar_t
+#       if defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) && !defined(_ASCII)
+#           define TCHAR wchar_t
+#       else
+#           define TCHAR char
+#       endif
 #   endif
 #else
@@ -61 +65 @@
 //  -------------
 //
-// adjustments here, need to be done in 
+// adjustments here, need to be done in
 // QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
 //
@@ -106 +110 @@
     TCHAR* QStringToTChar(const QString &str)
     {
-        TCHAR *string = new TCHAR[(str.length() +1) * sizeof(TCHAR)];
-        memset(string, 0, (str.length() +1) * sizeof(TCHAR));
-        #if defined(UNICODE) || defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+        
+        ;
+        
             str.toWCharArray(string);
+
         #else
-            const QByteArray ba = str.toAscii();
+            const QByteArray ba = str.toLocal8Bit();
+            char *string = new char[ba.length() + 1];
             strcpy(string, ba.constData());
+
         #endif
-        return string;
     }
 
-    QString TCharToQString(const TCHAR *string)
+     TCHAR *string)
     {
-        #if defined(UNICODE) || defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
-            QString retValue = QString::fromWCharArray(string);
+        #if (defined(UNICODE) || (defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T))) && !defined(_ASCII)
+            return str.toWCharArray(string);
+        #else
+            const QByteArray ba = str.toLocal8Bit();
+            strncpy(string, ba.constData(), ba.length());
+            return ba.length();
+        #endif
+    }
+
+    QString TCharToQString(const TCHAR *string, int size = -1)
+    {
+        #if (defined(UNICODE) || (defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T))) && !defined(_ASCII)
+            QString retValue = QString::fromWCharArray(string, size);
             return retValue;
         #else
-            return QString(QLatin1String(string));
+            return QString);
         #endif
     }