atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] corection of the acces of the zip element (error in the link section

Browse Source
This commit is contained in:
Edouard DUPIN 2013-07-24 22:27:04 +02:00
parent 3e63156c6c
commit 2e664009f8
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etk/Hach.h
View File

@ -69,11 +69,13 @@ namespace etk
{ {
for (int32_t iii=0; iii<m_data.Size(); iii++) { for (int32_t iii=0; iii<m_data.Size(); iii++) {
if (m_data[iii] != NULL) { if (m_data[iii] != NULL) {
//TK_INFO("Compare key : '" << m_data[iii]->m_key << "' with '" << _key << "'" );
if (m_data[iii]->m_key == _key) { if (m_data[iii]->m_key == _key) {
return iii; return iii;
} }
} }
} }
//TK_ERROR(" ==> not fund key '" << _key << "'" );
return -1; return -1;
} }
/** /**
@ -84,9 +86,12 @@ namespace etk
bool Exist(const etk::UString& _name) const bool Exist(const etk::UString& _name) const
{ {
int64_t elementId = GetId(_name); int64_t elementId = GetId(_name);
//TK_INFO(" Exist ? '" << _name << "' id=" << elementId );
if (elementId<0) { if (elementId<0) {
//TK_INFO(" ==> return false" );
return false; return false;
} }
//TK_INFO(" ==> return true" );
return true; return true;
} }
/** /**

4
etk/archive/Zip.h
View File

@ -10,7 +10,9 @@
#define __ETK_ARCHIVE_ZIP_H__ #define __ETK_ARCHIVE_ZIP_H__
#include <etk/archive/Archive.h> #include <etk/archive/Archive.h>
#include <minizip/unzip.h> extern "C" {
#include <minizip/unzip.h>
}
namespace etk namespace etk
{ {

6
etk/os/FSNode.cpp
View File

@ -715,7 +715,11 @@ void etk::FSNode::GenerateFileSystemPath(void)
} }
// check in the Appl data : In every case we return this one ... // check in the Appl data : In every case we return this one ...
m_systemFileName = baseFolderData + "theme/" + themeName + "/" + basicName; m_systemFileName = baseFolderData + "theme/" + themeName + "/" + basicName;
m_type = etk::FSN_TYPE_THEME_DATA; if (true==DirectCheckFile(m_systemFileName, true)) {
m_type = etk::FSN_TYPE_THEME_DATA;
return;
}
m_type = etk::FSN_TYPE_UNKNOW;
return; return;
} }
break; break;

1
lutin_etk.py
View File

@ -64,7 +64,6 @@ def Create(target):
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__)) myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
# add the currrent module at the # add the currrent module at the
return myModule return myModule