-rw-r--r-- | libopie2/opienet/omanufacturerdb.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp index bcce11f..006ae72 100644 --- a/libopie2/opienet/omanufacturerdb.cpp +++ b/libopie2/opienet/omanufacturerdb.cpp | |||
@@ -61,71 +61,52 @@ OManufacturerDB::OManufacturerDB() | |||
61 | odebug << "OManufacturerDB: trying to read " << filename << oendl; | 61 | odebug << "OManufacturerDB: trying to read " << filename << oendl; |
62 | if ( !QFile::exists( filename ) ) | 62 | if ( !QFile::exists( filename ) ) |
63 | { | 63 | { |
64 | filename = "/usr/share/wellenreiter/manufacturers"; | 64 | filename = "/usr/share/wellenreiter/manufacturers"; |
65 | odebug << "OManufacturerDB: trying to read " << filename << oendl; | 65 | odebug << "OManufacturerDB: trying to read " << filename << oendl; |
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | QFile file( filename ); | 69 | QFile file( filename ); |
70 | bool hasFile = file.open( IO_ReadOnly ); | 70 | bool hasFile = file.open( IO_ReadOnly ); |
71 | if (!hasFile) | 71 | if (!hasFile) |
72 | { | 72 | { |
73 | owarn << "OManufacturerDB: no valid manufacturer list found." << oendl; | 73 | owarn << "OManufacturerDB: no valid manufacturer list found." << oendl; |
74 | } | 74 | } |
75 | else | 75 | else |
76 | { | 76 | { |
77 | odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl; | 77 | odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl; |
78 | QTextStream s( &file ); | 78 | QTextStream s( &file ); |
79 | QString addr; | 79 | QString addr; |
80 | QString manu; | 80 | QString manu; |
81 | QString extManu; | 81 | QString extManu; |
82 | while (!s.atEnd()) | 82 | while (!s.atEnd()) |
83 | { | 83 | { |
84 | s >> addr; | 84 | s >> addr; |
85 | if ( !addr ) // read nothing!? | ||
86 | { | ||
87 | continue; | ||
88 | } | ||
89 | else | ||
90 | if ( addr[0] == '#' ) | ||
91 | { | ||
92 | continue; | ||
93 | } | ||
94 | s.skipWhiteSpace(); | ||
95 | s >> manu; | 85 | s >> manu; |
96 | s.skipWhiteSpace(); | ||
97 | s >> extManu; | 86 | s >> extManu; |
98 | if ( extManu[0] == '#' ) // we have an extended manufacturer | 87 | |
99 | { | ||
100 | s.skipWhiteSpace(); | ||
101 | extManu = s.readLine(); | ||
102 | odebug << "OManufacturerDB: read " << extManu << " as extended manufacturer string" << oendl; | ||
103 | manufacturersExt.insert( addr, extManu ); | ||
104 | } | ||
105 | else | ||
106 | s.readLine(); | ||
107 | odebug << "OManufacturerDB: read tuple " << addr << ", " << manu << oendl; | ||
108 | manufacturers.insert( addr, manu ); | 88 | manufacturers.insert( addr, manu ); |
89 | manufacturersExt.insert( addr, extManu ); | ||
90 | odebug << "OmanufacturerDB: parse '" << addr << "' as '" << manu << "' (" << extManu << ")" << oendl; | ||
109 | } | 91 | } |
110 | } | 92 | } |
111 | |||
112 | } | 93 | } |
113 | 94 | ||
114 | 95 | ||
115 | OManufacturerDB::~OManufacturerDB() | 96 | OManufacturerDB::~OManufacturerDB() |
116 | { | 97 | { |
117 | } | 98 | } |
118 | 99 | ||
119 | 100 | ||
120 | const QString& OManufacturerDB::lookup( const QString& macaddr ) const | 101 | const QString& OManufacturerDB::lookup( const QString& macaddr ) const |
121 | { | 102 | { |
122 | return manufacturers[macaddr.upper().left(8)]; | 103 | return manufacturers[macaddr.upper().left(8)]; |
123 | } | 104 | } |
124 | 105 | ||
125 | 106 | ||
126 | const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const | 107 | const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const |
127 | { | 108 | { |
128 | QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) ); | 109 | QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) ); |
129 | return it == manufacturersExt.end() ? lookup( macaddr ) : *it; | 110 | return it == manufacturersExt.end() ? lookup( macaddr ) : *it; |
130 | } | 111 | } |
131 | 112 | ||