author | zecke <zecke> | 2002-06-23 19:25:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-23 19:25:49 (UTC) |
commit | 7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8 (patch) (side-by-side diff) | |
tree | 08c4b8268c71e568096ad154b0fecb20df76e25b /noncore/net/opietooth/lib/parser.cc | |
parent | 616f8cef3111756cac0240be10aea38d4f38ad8e (diff) | |
download | opie-7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8.zip opie-7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8.tar.gz opie-7c4524d0ff6d329c1f5f76fa2e7a727e553d51c8.tar.bz2 |
Fix Service/Profile parser
Diffstat (limited to 'noncore/net/opietooth/lib/parser.cc') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 18d534e..00ec84a 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc @@ -14,18 +14,27 @@ namespace { // tactic find " ( int convert( const QString& line, QString& ret ) { +// qWarning("called"); ret = QString::null; int i = 0; int pos = line.findRev("\" ("); if ( pos > 0 ) { // it shouldn't be at pos 0 - ret = line.left(pos-1 ).stripWhiteSpace(); - qWarning("ret: %s", ret.latin1() ); + ret = line.left(pos ).stripWhiteSpace(); + // qWarning("ret: %s", ret.latin1() ); ret = ret.replace(QRegExp("[\"]"), ""); - qWarning("ret: %s", ret.latin1() ); - QString dummy = line.mid(pos + 4 ); - qWarning("dummy: %s", dummy.latin1() ); - dummy = dummy.remove( dummy.length() -1, 1 ); // remove the ( + //qWarning("ret: %s", ret.latin1() ); + QString dummy = line.mid(pos + 5 ); + //qWarning("dummy: %s", dummy.latin1() ); + dummy = dummy.replace(QRegExp("[)]"), ""); + //qWarning("dummy: %s", dummy.latin1() ); +// dummy = dummy.remove( dummy.length() -2, 1 ); // remove the ) bool ok; i = dummy.toInt(&ok, 16 ); + //if (ok ) { + // qWarning("converted %d", i); + //}else qWarning("failed" ); + //qWarning("exiting"); + return i; } + //qWarning("output %d", i ); return i; } @@ -46,12 +55,15 @@ void Parser::parse( const QString& string) { m_list.clear(); m_complete = true; - QStringList list = QStringList::split('\n', string ); + QStringList list = QStringList::split('\n', string,TRUE ); QStringList::Iterator it; for (it = list.begin(); it != list.end(); ++it ) { + qWarning("line:%s:line", (*it).latin1() ); if ( (*it).startsWith("Browsing") ) continue; - if ( (*it).isEmpty() ) { // line is empty because a new Service begins + if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins + qWarning("could add"); // now see if complete and add if (m_complete ) { + if (!m_item.serviceName().isEmpty() ) m_list.append( m_item ); Services serv; @@ -69,6 +81,15 @@ void Parser::parse( const QString& string) { // missed the last one if (m_complete) { + qWarning("adding"); + if (!m_item.serviceName().isEmpty() ) m_list.append(m_item ); } + QValueList<Services>::Iterator it2; + + if (m_list.isEmpty() ) + qWarning("m_list is empty"); + for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { + qWarning("name %s", (*it2).serviceName().latin1() ); + } } bool Parser::parseName( const QString& str) { @@ -84,11 +105,13 @@ bool Parser::parseRecHandle( const QString& str) { QString out = str.mid(18 ).stripWhiteSpace(); qWarning("out %s", out.latin1() ); - int value = out.toInt(&m_ok, 16 ); + int value = out.mid(2).toInt(&m_ok, 16 ); if (m_ok && (value != -1) ) m_complete = true; else m_complete = false; - return true; + qWarning("rec handle %d", value); m_item.setRecHandle( value ); + return true; + } return false; |