author | zautrix <zautrix> | 2004-10-13 05:15:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-13 05:15:03 (UTC) |
commit | f08cf9044213a60c87e2bf299665d13a335feff5 (patch) (unidiff) | |
tree | c9c0e8b0f7f7a48dcee8fbdd5b9a467985c78fdd /kabc/vcardparser | |
parent | 308bc78a3ab0d27718070a5ebdf3f019ac570c6b (diff) | |
download | kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.zip kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.tar.gz kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.tar.bz2 |
fixed some newline probs
-rw-r--r-- | kabc/vcardparser/vcardparser.cpp | 2 | ||||
-rw-r--r-- | kabc/vcardparser/vcardtool.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 9ea084d..bec2a0c 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp | |||
@@ -52,129 +52,129 @@ VCard::List VCardParser::parseVCards( const QString& text ) | |||
52 | continue; | 52 | continue; |
53 | 53 | ||
54 | if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous | 54 | if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous |
55 | currentLine += (*it).remove( 0, 1 ); | 55 | currentLine += (*it).remove( 0, 1 ); |
56 | continue; | 56 | continue; |
57 | } else { | 57 | } else { |
58 | if ( inVCard && !currentLine.isEmpty() ) { // now parse the line | 58 | if ( inVCard && !currentLine.isEmpty() ) { // now parse the line |
59 | int colon = currentLine.find( ':' ); | 59 | int colon = currentLine.find( ':' ); |
60 | if ( colon == -1 ) { // invalid line | 60 | if ( colon == -1 ) { // invalid line |
61 | currentLine = (*it); | 61 | currentLine = (*it); |
62 | continue; | 62 | continue; |
63 | } | 63 | } |
64 | 64 | ||
65 | VCardLine vCardLine; | 65 | VCardLine vCardLine; |
66 | QString key = currentLine.left( colon ).stripWhiteSpace(); | 66 | QString key = currentLine.left( colon ).stripWhiteSpace(); |
67 | QString value = currentLine.mid( colon + 1 ); | 67 | QString value = currentLine.mid( colon + 1 ); |
68 | 68 | ||
69 | QStringList params = QStringList::split( ';', key ); | 69 | QStringList params = QStringList::split( ';', key ); |
70 | vCardLine.setIdentifier( params[0] ); | 70 | vCardLine.setIdentifier( params[0] ); |
71 | if ( params.count() > 1 ) { // find all parameters | 71 | if ( params.count() > 1 ) { // find all parameters |
72 | for ( uint i = 1; i < params.count(); ++i ) { | 72 | for ( uint i = 1; i < params.count(); ++i ) { |
73 | QStringList pair = QStringList::split( '=', params[i] ); | 73 | QStringList pair = QStringList::split( '=', params[i] ); |
74 | //US if ( pair.size() == 1 ) { | 74 | //US if ( pair.size() == 1 ) { |
75 | if ( pair.count() == 1 ) { | 75 | if ( pair.count() == 1 ) { |
76 | pair.prepend( "type" ); | 76 | pair.prepend( "type" ); |
77 | } | 77 | } |
78 | if ( pair[1].contains( ',' ) ) { // parameter in type=x,y,z format | 78 | if ( pair[1].contains( ',' ) ) { // parameter in type=x,y,z format |
79 | QStringList args = QStringList::split( ',', pair[ 1 ] ); | 79 | QStringList args = QStringList::split( ',', pair[ 1 ] ); |
80 | for ( uint j = 0; j < args.count(); ++j ) | 80 | for ( uint j = 0; j < args.count(); ++j ) |
81 | vCardLine.addParameter( pair[0].lower(), args[j] ); | 81 | vCardLine.addParameter( pair[0].lower(), args[j] ); |
82 | } else | 82 | } else |
83 | vCardLine.addParameter( pair[0].lower(), pair[1] ); | 83 | vCardLine.addParameter( pair[0].lower(), pair[1] ); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | params = vCardLine.parameterList(); | 87 | params = vCardLine.parameterList(); |
88 | if ( params.contains( "encoding" ) ) { // have to decode the data | 88 | if ( params.contains( "encoding" ) ) { // have to decode the data |
89 | #if 0 | 89 | #if 0 |
90 | QByteArray input, output; | 90 | QByteArray input, output; |
91 | input = value.local8Bit(); | 91 | input = value.local8Bit(); |
92 | if ( vCardLine.parameter( "encoding" ).lower() == "b" ) | 92 | if ( vCardLine.parameter( "encoding" ).lower() == "b" ) |
93 | KCodecs::base64Decode( input, output ); | 93 | KCodecs::base64Decode( input, output ); |
94 | else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) | 94 | else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) |
95 | KCodecs::quotedPrintableDecode( input, output ); | 95 | KCodecs::quotedPrintableDecode( input, output ); |
96 | 96 | ||
97 | //qDebug("VCardParser::parseVCards has to be verified"); | 97 | //qDebug("VCardParser::parseVCards has to be verified"); |
98 | //US I am not sure if this is correct | 98 | //US I am not sure if this is correct |
99 | //US vCardLine.setValue( output ); | 99 | //US vCardLine.setValue( output ); |
100 | QCString cs(output); | 100 | QCString cs(output); |
101 | qDebug("len1 %d len2 %d ",input.size(), output.size( )); | 101 | qDebug("len1 %d len2 %d ",input.size(), output.size( )); |
102 | #endif | 102 | #endif |
103 | QCString cs = value.local8Bit(); | 103 | QCString cs = value.local8Bit(); |
104 | qDebug("****************************************** "); | 104 | qDebug("****************************************** "); |
105 | qDebug("************* WARNING ******************** "); | 105 | qDebug("************* WARNING ******************** "); |
106 | qDebug("****************************************** "); | 106 | qDebug("****************************************** "); |
107 | qDebug("Make sure, the decoding is done after"); | 107 | qDebug("Make sure, the decoding is done after"); |
108 | qDebug("QVariant conversion!"); | 108 | qDebug("QVariant conversion!"); |
109 | qDebug("Insert Line DECODING OKAY, where this is implemented"); | 109 | qDebug("Insert Line DECODING OKAY, where this is implemented"); |
110 | // use for decoding the above code! | 110 | // use for decoding the above code! |
111 | vCardLine.setValue( cs ); | 111 | vCardLine.setValue( cs ); |
112 | } else { | 112 | } else { |
113 | 113 | ||
114 | //qDebug("VCardParser::parseVCards has to be verified"); | 114 | //qDebug("VCardParser::parseVCards has to be verified"); |
115 | //US vCardLine.setValue( value.replace( "\\n", "\n" ) ); | 115 | //US vCardLine.setValue( value.replace( "\\n", "\n" ) ); |
116 | vCardLine.setValue( value.replace( QRegExp("\\n"), "\n" ) ); | 116 | vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) ); |
117 | } | 117 | } |
118 | 118 | ||
119 | currentVCard.addLine( vCardLine ); | 119 | currentVCard.addLine( vCardLine ); |
120 | } | 120 | } |
121 | // we do not save the start and end tag as vcardline | 121 | // we do not save the start and end tag as vcardline |
122 | if ( (*it).lower().startsWith( "begin:vcard" ) ) { | 122 | if ( (*it).lower().startsWith( "begin:vcard" ) ) { |
123 | inVCard = true; | 123 | inVCard = true; |
124 | //qDebug("VCardParser::parseVCards has to be verified"); | 124 | //qDebug("VCardParser::parseVCards has to be verified"); |
125 | //US currentLine.setLength( 0 ); | 125 | //US currentLine.setLength( 0 ); |
126 | currentLine = ""; | 126 | currentLine = ""; |
127 | currentVCard.clear(); // flush vcard | 127 | currentVCard.clear(); // flush vcard |
128 | continue; | 128 | continue; |
129 | } | 129 | } |
130 | 130 | ||
131 | if ( (*it).lower().startsWith( "end:vcard" ) ) { | 131 | if ( (*it).lower().startsWith( "end:vcard" ) ) { |
132 | inVCard = false; | 132 | inVCard = false; |
133 | vCardList.append( currentVCard ); | 133 | vCardList.append( currentVCard ); |
134 | //qDebug("VCardParser::parseVCards has to be verified"); | 134 | //qDebug("VCardParser::parseVCards has to be verified"); |
135 | //US currentLine.setLength( 0 ); | 135 | //US currentLine.setLength( 0 ); |
136 | currentLine = ""; | 136 | currentLine = ""; |
137 | currentVCard.clear(); // flush vcard | 137 | currentVCard.clear(); // flush vcard |
138 | continue; | 138 | continue; |
139 | } | 139 | } |
140 | 140 | ||
141 | currentLine = (*it); | 141 | currentLine = (*it); |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | return vCardList; | 145 | return vCardList; |
146 | } | 146 | } |
147 | 147 | ||
148 | QString VCardParser::createVCards( const VCard::List& list ) | 148 | QString VCardParser::createVCards( const VCard::List& list ) |
149 | { | 149 | { |
150 | QString text; | 150 | QString text; |
151 | QString textLine; | 151 | QString textLine; |
152 | QString encodingType; | 152 | QString encodingType; |
153 | QStringList idents; | 153 | QStringList idents; |
154 | QStringList params; | 154 | QStringList params; |
155 | QStringList values; | 155 | QStringList values; |
156 | QStringList::ConstIterator identIt; | 156 | QStringList::ConstIterator identIt; |
157 | QStringList::Iterator paramIt; | 157 | QStringList::Iterator paramIt; |
158 | QStringList::Iterator valueIt; | 158 | QStringList::Iterator valueIt; |
159 | 159 | ||
160 | VCardLine::List lines; | 160 | VCardLine::List lines; |
161 | VCardLine::List::Iterator lineIt; | 161 | VCardLine::List::Iterator lineIt; |
162 | VCard::List::ConstIterator cardIt; | 162 | VCard::List::ConstIterator cardIt; |
163 | 163 | ||
164 | bool hasEncoding; | 164 | bool hasEncoding; |
165 | 165 | ||
166 | 166 | ||
167 | // iterate over the cards | 167 | // iterate over the cards |
168 | for ( cardIt = list.begin(); cardIt != list.end(); ++cardIt ) { | 168 | for ( cardIt = list.begin(); cardIt != list.end(); ++cardIt ) { |
169 | text.append( "BEGIN:VCARD\r\n" ); | 169 | text.append( "BEGIN:VCARD\r\n" ); |
170 | 170 | ||
171 | idents = (*cardIt).identifiers(); | 171 | idents = (*cardIt).identifiers(); |
172 | for ( identIt = idents.begin(); identIt != idents.end(); ++identIt ) { | 172 | for ( identIt = idents.begin(); identIt != idents.end(); ++identIt ) { |
173 | VCard card = (*cardIt); | 173 | VCard card = (*cardIt); |
174 | lines = card.lines( (*identIt) ); | 174 | lines = card.lines( (*identIt) ); |
175 | 175 | ||
176 | // iterate over the lines | 176 | // iterate over the lines |
177 | for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) { | 177 | for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) { |
178 | if ( !(*lineIt).value().asString().isEmpty() ) { | 178 | if ( !(*lineIt).value().asString().isEmpty() ) { |
179 | textLine = (*lineIt).identifier(); | 179 | textLine = (*lineIt).identifier(); |
180 | 180 | ||
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp index 3fb212e..d1f823b 100644 --- a/kabc/vcardparser/vcardtool.cpp +++ b/kabc/vcardparser/vcardtool.cpp | |||
@@ -751,133 +751,133 @@ VCardLine VCardTool::createKey( const Key &key ) | |||
751 | } | 751 | } |
752 | } else if ( !key.textData().isEmpty() ) | 752 | } else if ( !key.textData().isEmpty() ) |
753 | line.setValue( key.textData() ); | 753 | line.setValue( key.textData() ); |
754 | 754 | ||
755 | if ( key.type() == Key::X509 ) | 755 | if ( key.type() == Key::X509 ) |
756 | line.addParameter( "type", "X509" ); | 756 | line.addParameter( "type", "X509" ); |
757 | else if ( key.type() == Key::PGP ) | 757 | else if ( key.type() == Key::PGP ) |
758 | line.addParameter( "type", "PGP" ); | 758 | line.addParameter( "type", "PGP" ); |
759 | else if ( key.type() == Key::Custom ) | 759 | else if ( key.type() == Key::Custom ) |
760 | line.addParameter( "type", key.customTypeString() ); | 760 | line.addParameter( "type", key.customTypeString() ); |
761 | 761 | ||
762 | return line; | 762 | return line; |
763 | } | 763 | } |
764 | 764 | ||
765 | Secrecy VCardTool::parseSecrecy( const VCardLine &line ) | 765 | Secrecy VCardTool::parseSecrecy( const VCardLine &line ) |
766 | { | 766 | { |
767 | Secrecy secrecy; | 767 | Secrecy secrecy; |
768 | 768 | ||
769 | if ( line.value().asString().lower() == "public" ) | 769 | if ( line.value().asString().lower() == "public" ) |
770 | secrecy.setType( Secrecy::Public ); | 770 | secrecy.setType( Secrecy::Public ); |
771 | if ( line.value().asString().lower() == "private" ) | 771 | if ( line.value().asString().lower() == "private" ) |
772 | secrecy.setType( Secrecy::Private ); | 772 | secrecy.setType( Secrecy::Private ); |
773 | if ( line.value().asString().lower() == "confidential" ) | 773 | if ( line.value().asString().lower() == "confidential" ) |
774 | secrecy.setType( Secrecy::Confidential ); | 774 | secrecy.setType( Secrecy::Confidential ); |
775 | 775 | ||
776 | return secrecy; | 776 | return secrecy; |
777 | } | 777 | } |
778 | 778 | ||
779 | VCardLine VCardTool::createSecrecy( const Secrecy &secrecy ) | 779 | VCardLine VCardTool::createSecrecy( const Secrecy &secrecy ) |
780 | { | 780 | { |
781 | VCardLine line( "CLASS" ); | 781 | VCardLine line( "CLASS" ); |
782 | 782 | ||
783 | int type = secrecy.type(); | 783 | int type = secrecy.type(); |
784 | 784 | ||
785 | if ( type == Secrecy::Public ) | 785 | if ( type == Secrecy::Public ) |
786 | line.setValue( "PUBLIC" ); | 786 | line.setValue( "PUBLIC" ); |
787 | else if ( type == Secrecy::Private ) | 787 | else if ( type == Secrecy::Private ) |
788 | line.setValue( "PRIVATE" ); | 788 | line.setValue( "PRIVATE" ); |
789 | else if ( type == Secrecy::Confidential ) | 789 | else if ( type == Secrecy::Confidential ) |
790 | line.setValue( "CONFIDENTIAL" ); | 790 | line.setValue( "CONFIDENTIAL" ); |
791 | 791 | ||
792 | return line; | 792 | return line; |
793 | } | 793 | } |
794 | 794 | ||
795 | Agent VCardTool::parseAgent( const VCardLine &line ) | 795 | Agent VCardTool::parseAgent( const VCardLine &line ) |
796 | { | 796 | { |
797 | Agent agent; | 797 | Agent agent; |
798 | 798 | ||
799 | QStringList params = line.parameterList(); | 799 | QStringList params = line.parameterList(); |
800 | if ( params.contains( "value" ) ) { | 800 | if ( params.contains( "value" ) ) { |
801 | if ( line.parameter( "value" ).lower() == "uri" ) | 801 | if ( line.parameter( "value" ).lower() == "uri" ) |
802 | agent.setUrl( line.value().asString() ); | 802 | agent.setUrl( line.value().asString() ); |
803 | } else { | 803 | } else { |
804 | QString str = line.value().asString(); | 804 | QString str = line.value().asString(); |
805 | 805 | ||
806 | //US using the old implementation instead | 806 | //US using the old implementation instead |
807 | qDebug("VCardTool::parseAgent has to be verified"); | 807 | qDebug("VCardTool::parseAgent has to be verified"); |
808 | /*US | 808 | /*US |
809 | str.replace( "\\n", "\r\n" ); | 809 | str.replace( "\\n", "\r\n" ); |
810 | str.replace( "\\N", "\r\n" ); | 810 | str.replace( "\\N", "\r\n" ); |
811 | str.replace( "\\;", ";" ); | 811 | str.replace( "\\;", ";" ); |
812 | str.replace( "\\:", ":" ); | 812 | str.replace( "\\:", ":" ); |
813 | str.replace( "\\,", "," ); | 813 | str.replace( "\\,", "," ); |
814 | */ | 814 | */ |
815 | str.replace( QRegExp("\\n") , "\r\n" ); | 815 | str.replace( QRegExp("\\\\n") , "\r\n" ); |
816 | str.replace( QRegExp("\\N") , "\r\n" ); | 816 | str.replace( QRegExp("\\\\N") , "\r\n" ); |
817 | str.replace( QRegExp("\\;") , ";" ); | 817 | str.replace( QRegExp("\\\\;") , ";" ); |
818 | str.replace( QRegExp("\\:") , ":" ); | 818 | str.replace( QRegExp("\\\\:") , ":" ); |
819 | str.replace( QRegExp("\\,") , "," ); | 819 | str.replace( QRegExp("\\\\,") , "," ); |
820 | 820 | ||
821 | Addressee::List list = parseVCards( str ); | 821 | Addressee::List list = parseVCards( str ); |
822 | if ( list.count() > 0 ) { | 822 | if ( list.count() > 0 ) { |
823 | Addressee *addr = new Addressee; | 823 | Addressee *addr = new Addressee; |
824 | *addr = list[ 0 ]; | 824 | *addr = list[ 0 ]; |
825 | agent.setAddressee( addr ); | 825 | agent.setAddressee( addr ); |
826 | } | 826 | } |
827 | } | 827 | } |
828 | 828 | ||
829 | return agent; | 829 | return agent; |
830 | } | 830 | } |
831 | 831 | ||
832 | VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) | 832 | VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) |
833 | { | 833 | { |
834 | VCardLine line( "AGENT" ); | 834 | VCardLine line( "AGENT" ); |
835 | 835 | ||
836 | if ( agent.isIntern() ) { | 836 | if ( agent.isIntern() ) { |
837 | if ( agent.addressee() != 0 ) { | 837 | if ( agent.addressee() != 0 ) { |
838 | Addressee::List list; | 838 | Addressee::List list; |
839 | list.append( *agent.addressee() ); | 839 | list.append( *agent.addressee() ); |
840 | 840 | ||
841 | QString str = createVCards( list, version ); | 841 | QString str = createVCards( list, version ); |
842 | 842 | ||
843 | //US using the old implementation instead | 843 | //US using the old implementation instead |
844 | qDebug("VCardTool::createAgent has to be verified"); | 844 | qDebug("VCardTool::createAgent has to be verified"); |
845 | /*US | 845 | /*US |
846 | str.replace( "\r\n", "\\n" ); | 846 | str.replace( "\r\n", "\\n" ); |
847 | str.replace( ";", "\\;" ); | 847 | str.replace( ";", "\\;" ); |
848 | str.replace( ":", "\\:" ); | 848 | str.replace( ":", "\\:" ); |
849 | str.replace( ",", "\\," ); | 849 | str.replace( ",", "\\," ); |
850 | */ | 850 | */ |
851 | str.replace( QRegExp("\r\n"), "\\n" ); | 851 | str.replace( QRegExp("\r\n"), "\\n" ); |
852 | str.replace( QRegExp(";"), "\\;" ); | 852 | str.replace( QRegExp(";"), "\\;" ); |
853 | str.replace( QRegExp(":"), "\\:" ); | 853 | str.replace( QRegExp(":"), "\\:" ); |
854 | str.replace( QRegExp(","), "\\," ); | 854 | str.replace( QRegExp(","), "\\," ); |
855 | line.setValue( str ); | 855 | line.setValue( str ); |
856 | } | 856 | } |
857 | } else if ( !agent.url().isEmpty() ) { | 857 | } else if ( !agent.url().isEmpty() ) { |
858 | line.setValue( agent.url() ); | 858 | line.setValue( agent.url() ); |
859 | line.addParameter( "value", "URI" ); | 859 | line.addParameter( "value", "URI" ); |
860 | } | 860 | } |
861 | 861 | ||
862 | return line; | 862 | return line; |
863 | } | 863 | } |
864 | 864 | ||
865 | QStringList VCardTool::splitString( const QChar &sep, const QString &str ) | 865 | QStringList VCardTool::splitString( const QChar &sep, const QString &str ) |
866 | { | 866 | { |
867 | QStringList list; | 867 | QStringList list; |
868 | QString value( str ); | 868 | QString value( str ); |
869 | 869 | ||
870 | int start = 0; | 870 | int start = 0; |
871 | int pos = value.find( sep, start ); | 871 | int pos = value.find( sep, start ); |
872 | 872 | ||
873 | while ( pos != -1 ) { | 873 | while ( pos != -1 ) { |
874 | if ( value[ pos - 1 ] != '\\' ) { | 874 | if ( value[ pos - 1 ] != '\\' ) { |
875 | if ( pos > start && pos <= (int)value.length() ) | 875 | if ( pos > start && pos <= (int)value.length() ) |
876 | list << value.mid( start, pos - start ); | 876 | list << value.mid( start, pos - start ); |
877 | else | 877 | else |
878 | list << QString::null; | 878 | list << QString::null; |
879 | 879 | ||
880 | start = pos + 1; | 880 | start = pos + 1; |
881 | pos = value.find( sep, start ); | 881 | pos = value.find( sep, start ); |
882 | } else { | 882 | } else { |
883 | if ( pos != 0 ) { | 883 | if ( pos != 0 ) { |