diff --git a/le-search/gerar.sh b/le-search/gerar.sh
old mode 100644
new mode 100755
diff --git a/le-search/src/Makefile b/le-search/src/Makefile
index 1f1ac833a5c4663a860b61fa3a3fdaa80cfb6052..dd12eb3d3485e52b39b85ea6d3a63d78cc693c6e 100644
--- a/le-search/src/Makefile
+++ b/le-search/src/Makefile
@@ -1,9 +1,9 @@
#############################################################################
-# Makefile for building: qt
-# Generated by qmake (2.01a) (Qt 4.7.0) on: qui jan 27 10:12:45 2011
+# Makefile for building: le-search
+# Generated by qmake (2.01a) (Qt 4.6.2) on: seg set 10 14:06:51 2012
# Project: qt.pro
# Template: app
-# Command: /usr/bin/qmake -o Makefile qt.pro
+# Command: /usr/bin/qmake -unix -o Makefile qt.pro
#############################################################################
####### Compiler, tools and options
@@ -13,10 +13,10 @@ CXX = g++
DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I/usr/include/libxml2 -I. -I. -I.
+INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I/usr/include/libxml2 -I. -I.
LINK = g++
LFLAGS = -Wl,-O1
-LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread -lxml2
+LIBS = $(SUBLIBS) -L/usr/lib -lxml2 -lQtGui -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake
@@ -128,7 +128,7 @@ Makefile: qt.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mks
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
/usr/lib/libQtGui.prl \
/usr/lib/libQtCore.prl
- $(QMAKE) -o Makefile qt.pro
+ $(QMAKE) -unix -o Makefile qt.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf:
@@ -151,11 +151,11 @@ Makefile: qt.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mks
/usr/lib/libQtGui.prl:
/usr/lib/libQtCore.prl:
qmake: FORCE
- @$(QMAKE) -o Makefile qt.pro
+ @$(QMAKE) -unix -o Makefile qt.pro
dist:
- @$(CHK_DIR_EXISTS) .tmp/qt1.0.0 || $(MKDIR) .tmp/qt1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qt1.0.0/ && $(COPY_FILE) --parents categorize.h convert.h main.h mySearch.h readXml.h walk.h .tmp/qt1.0.0/ && $(COPY_FILE) --parents categorize.cpp convert.c main.cpp mySearch.cpp readXml.c walk.c .tmp/qt1.0.0/ && $(COPY_FILE) --parents mySearch.ui mySearchHelp.ui .tmp/qt1.0.0/ && (cd `dirname .tmp/qt1.0.0` && $(TAR) qt1.0.0.tar qt1.0.0 && $(COMPRESS) qt1.0.0.tar) && $(MOVE) `dirname .tmp/qt1.0.0`/qt1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qt1.0.0
+ @$(CHK_DIR_EXISTS) .tmp/le-search1.0.0 || $(MKDIR) .tmp/le-search1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/le-search1.0.0/ && $(COPY_FILE) --parents categorize.h convert.h main.h mySearch.h readXml.h walk.h .tmp/le-search1.0.0/ && $(COPY_FILE) --parents categorize.cpp convert.c main.cpp mySearch.cpp readXml.c walk.c .tmp/le-search1.0.0/ && $(COPY_FILE) --parents mySearch.ui mySearchHelp.ui .tmp/le-search1.0.0/ && (cd `dirname .tmp/le-search1.0.0` && $(TAR) le-search1.0.0.tar le-search1.0.0 && $(COMPRESS) le-search1.0.0.tar) && $(MOVE) `dirname .tmp/le-search1.0.0`/le-search1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/le-search1.0.0
clean:compiler_clean
@@ -170,8 +170,6 @@ distclean: clean
-$(DEL_FILE) Makefile
-check: first
-
mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
diff --git a/le-search/src/categorize.cpp b/le-search/src/categorize.cpp
index c87d12851f7bc0d10ef0c11a8b5db2a813eb0df3..76ebf714be12d19b8428579494a615b2976d0c66 100644
--- a/le-search/src/categorize.cpp
+++ b/le-search/src/categorize.cpp
@@ -19,9 +19,19 @@ void categorizeXml(const char *xmlFile, map<string, set<string> >& M) {
name = xmlTextReaderConstName(reader);
if ( xmlTextReaderHasAttributes(reader) == 1 ) {
node.category = xmlTextReaderGetAttribute(reader, xmlCharStrdup("category"));
- node.media = xmlTextReaderGetAttribute(reader, xmlCharStrdup("media"));
+ node.media = xmlTextReaderGetAttribute(reader, xmlCharStrdup("media"));
category = QString().fromLatin1((char *)node.category).toStdString();
media = QString().fromLatin1((char *)node.media).toStdString();
+
+ //Original
+ //category = QString().fromUtf8((char *)node.category).toStdString();
+ //media = QString().fromUtf8((char *)node.media).toStdString();
+
+ //Teste pra ver a saída na tela
+// if ( string((char*)node.category) == "História" ) {
+// cout << "node.category = " << node.category << endl;
+// cout << "category = " << category << endl;
+// }
M[media].insert(category);
}
ret = xmlTextReaderRead(reader);
diff --git a/le-search/src/qt.pro b/le-search/src/qt.pro
index 875af27a54664e16f4a966ee1cf095777f8c039a..c709aed0329126dc08c9922e508a531561ac1c33 100644
--- a/le-search/src/qt.pro
+++ b/le-search/src/qt.pro
@@ -3,9 +3,10 @@
######################################################################
TEMPLATE = app
-TARGET =
+TARGET = le-search
DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += /usr/include/libxml2
+LIBS += -lxml2
# Input
HEADERS += categorize.h convert.h main.h mySearch.h readXml.h walk.h