Action codes:
     + = Examined, looks fine.  Some of these were fixed by Bob and are not
         fine in the CdrServer from last week.
     - = Unexamined, looks okay based on what I see in this file
     & = Examined, looks wrong, fixed it (or tried to)
     = = Same as '&' except that the change is already recorded elsewhere
     ? = Unchanged but maybe should be.

Indented comments appear below some lines.  The comment refers to the line
above.
Note:
     I removed all of the following patterns from the file after quick checks:
          "#include <.*>"
          "std::vector<.*>"
          "std::pair<.*>"
          "std::set<.*>"
          ": \*"              Comments
          ": *\/\/"           Comments

[1003 lines shown in this report]
SELECT.*title
------------------------------
+ CdrDoc.cpp:176:    std::string qry = "SELECT id, title_filter, xml_schema "
& CdrDoc.cpp:497:        "SELECT v.val_status, v.val_date, v.publishable, v.title, v.xml, "
     Entity conversion done on the selection getString - fixed
& CdrDocTypes.cpp:119:    cdr::db::ResultSet r = s.executeQuery("SELECT d.title"
     Existing code was fine but I changed it to conform to new convention that
     does the conversion on output instead of database retrieval.
& CdrDocTypes.cpp:611:    cdr::db::ResultSet r = s.executeQuery(" SELECT d.title, b.data     "
     Added entity conversion of title and css to elements in XML string: 
         "<File><Name>title</Name><Data>css</Data></File>"
+ CdrFilter.cpp:1032:  const char* const query = " SELECT title    "
     See problem on line 1041
- CdrFilter.cpp:1054:  std::string qry = "SELECT xml FROM document WHERE title = ?";
& CdrLink.cpp:564:            "SELECT DISTINCT source_doc, title, target_frag "
     No bug on this line but there was a bug on line 580 that inserted the
      title into something that would become XML without converting entities.
      Fixed line 580
& CdrLink.cpp:2320:    query = "SELECT title FROM document WHERE id = ?";
     Again, later use of unconverted title on line 2332.  Fixed.
+ CdrReport.cpp:1282:    string query = "SELECT DISTINCT d.id, d.title                            "
+ CdrReport.cpp:1323:        "  SELECT DISTINCT d.id, d.title                                "

entConvert
------------------------------
? CdrCache.cpp:315:                  cdr::entConvert(cdr::dom::getTextContent(node)).toUtf8();
     This is wrong by the current convention.  Should do the conversion later.
     However I'm not certain that none of the complex code for upcoding and
      tree walking depends on it.  So I'm leaving it alone.
& CdrDoc.cpp:396:    title          = cdr::entConvert (rs.getString (3));
     Entity conversion done on the selection getString - fixed
& CdrDoc.cpp:401:    comment        = cdr::entConvert (rs.getString (8));
     Entity conversion done on the selection getString - fixed
& CdrDoc.cpp:518:    title        = cdr::entConvert (rs.getString(4));
     Entity conversion done on the selection getString - fixed
+ CdrDoc.cpp:1296:                       + L" <DocTitle>" + cdr::entConvert(title)
= CdrDocTypes.cpp:128:        String name = cdr::entConvert(r.getString(1));
     See previous CdrDocTypes.cpp: 119
- CdrDocTypes.cpp:264:                resp << L"<ValidValue>" << cdr::entConvert(*j++)
+ CdrDom.cpp:296:            os << cdr::entConvert(value);
+ CdrDom.cpp:299:            os << L"<?" << name << L" " << cdr::entConvert(value) << L"?>";
+ CdrDom.cpp:319:                    cdr::entConvert(attribute.getNodeValue());
& CdrFilter.cpp:1041:  return cdr::entConvert(title);
     Existing code worked but I changed it to conform to new convention that
      does the conversion on output instead of database retrieval.
     There is only one line that invokes this static function.  I fixed it.
+ CdrFilter.cpp:1903:             << cdr::entConvert(name)
+ CdrFilter.cpp:1905:             << cdr::entConvert(desc)
+ CdrFilter.cpp:1908:        response << L"<FilterSetNotes>" << cdr::entConvert(notes)
+ CdrFilter.cpp:1945:                     << cdr::entConvert(name)
+ CdrFilter.cpp:1952:                     << cdr::entConvert(name)
+ CdrFilter.cpp:2066:                 << cdr::entConvert(name)
+ CdrFilter.cpp:2106:                 << cdr::entConvert(title)
& CdrFilter.cpp:2409:            cdr::String wValue = cdr::entConvert(rs.getString(i));
     Changed for new convention.  The change is actually slightly more
     efficient.
& CdrGetDoc.cpp:183:    cdr::String     title        = cdr::entConvert(rs.getString(3));
     Fixed for new conventions
& CdrGetDoc.cpp:186:    cdr::String     comment      = cdr::entConvert(rs.getString(6));
     Fixed for new conventions
+ CdrGetDoc.cpp:309:    cdrDoc += readOnlyWrap (cdr::entConvert(docVer->title), L"DocTitle")
     This one looks like it was a double conversion in the past, but CdrDoc
      constructor now fixed to pass an unconverted string.
+ CdrGetDoc.cpp:317:        cdrDoc += readOnlyWrap (cdr::entConvert(docVer->comment),
& CdrGetDoc.cpp:467:    cdr::String     title     = cdr::entConvert(rs.getString(3));
     Fixed for new conventions
& CdrGetDoc.cpp:468:    cdr::String     comment   = cdr::entConvert(rs.getString(4));
     Fixed for new conventions
& CdrGetDoc.cpp:523:  cdr::String     title     = cdr::entConvert(rs.getString(3));
     Fixed for new conventions
& CdrGetDoc.cpp:524:  cdr::String     comment   = cdr::entConvert(rs.getString(4));
     Fixed for new conventions
+ CdrGlossaryMap.cpp:84:        response << L"<Name>" << cdr::entConvert(name) << L"</Name>";
+ CdrGlossaryMap.cpp:87:            response << L"<Phrase>" << cdr::entConvert(*phrase)
+ CdrGlossaryMap.cpp:143:        response << L"<Name>" << cdr::entConvert(name) << L"</Name>";
+ CdrGlossaryMap.cpp:146:            response << L"<Phrase>" << cdr::entConvert(*phrase)
+ CdrLink.cpp:2225:                 id, cdr::entConvert(title).c_str());
+ CdrLinkProcs.cpp:990:                 id, cdr::entConvert(title).c_str());
+ CdrMergeProt.cpp:209:                cdr::String encoded = cdr::entConvert(value);
& CdrReport.cpp:584:      cdr::String title = cdr::entConvert(rs.getString(2));
     Changed 584, 593 and 621 to follow new convention of converting upon
      output rather than database fetch.
& CdrReport.cpp:666:      cdr::String title = cdr::entConvert(rs.getString(2));
     Changed lines 668, 671 for new convention.
+ CdrReport.cpp:791:               << cdr::entConvert(poName)
+ CdrReport.cpp:865:             << cdr::entConvert(*titleIter++)
& CdrReport.cpp:932:      cdr::String termName    = cdr::entConvert(rs.getString(2));
& CdrReport.cpp:933:      cdr::String menuType    = cdr::entConvert(rs.getString(3));
& CdrReport.cpp:934:      cdr::String menuStatus  = cdr::entConvert(rs.getString(4));
& CdrReport.cpp:937:      cdr::String sortString   = cdr::entConvert(rs.getString(7));
     Changed all four of the above for new convention.
+ CdrReport.cpp:949:                 << cdr::entConvert(displayName)
+ CdrReport.cpp:1058:               << cdr::entConvert(value) << L"</Value>\n";
- CdrReport.cpp:1303:               << cdr::entConvert(name)
- CdrReport.cpp:1348:               << cdr::entConvert(title)
+ CdrSearch.cpp:124:        cdr::String title   = cdr::entConvert(rs.getString(2));
     Took this one on faith.  It would take a lot of backtracing to find an
     error, but errors are hardly ever in extra entConverts.
- CdrString.cpp:160:cdr::String cdr::entConvert(const String& inStr, bool doQuotes)
+ CdrVersion.cpp:1177:               << entConvert(comment.c_str())
+ CdrXsd.cpp:517:               << cdr::entConvert(rules[i].getContext(), true)
+ CdrXsd.cpp:524:                   << cdr::entConvert(assertion.getTest(), true)
+ CdrXsd.cpp:528:                   << cdr::entConvert(msg, true)

"<.*>" - but removed all of the following after quick check on each pattern

------------------------------
+ CdrActions.cpp:39:            resp = L"<CdrListActionsResp>\n";
+ CdrActions.cpp:42:        resp += L"<Action><Name>" + name
+ CdrActions.cpp:43:              + L"</Name><NeedDoctype>" + flag
+ CdrActions.cpp:44:              + L"</NeedDoctype></Action>\n";
+ CdrActions.cpp:47:        return L"<CdrListActionsResp/>\n";
+ CdrActions.cpp:49:        return resp + L"</CdrListActionsResp>\n";
+ CdrActions.cpp:94:    cdr::String resp = L"<CdrGetActionResp>"
+ CdrActions.cpp:95:                       L"<Name>" + name + L"</Name>"
+ CdrActions.cpp:96:                       L"<DoctypeSpecific>" + flag + L"</DoctypeSpecific>"
& CdrActions.cpp:97:                       L"<Comment>" + comment + L"</Comment>"
     Wrapped comment with entConvert in case we have "This does this & that"
     Left actions alone on the theory that we're not going to put "THIS&THAT"
      in an action name.
+ CdrActions.cpp:98:                       L"</CdrGetActionResp>";
+ CdrActions.cpp:159:    return L"<CdrAddActionResp/>";
+ CdrActions.cpp:217:                        "   AND doc_type <> 1";
+ CdrActions.cpp:263:    return L"<CdrRepActionResp/>";
+ CdrActions.cpp:316:    return L"  <CdrDelActionResp/>\n";
- CdrAddGrp.cpp:19:typedef std::list<Auth> AuthList;
- CdrAddGrp.cpp:153:    return L"  <CdrAddGrpResp/>\n";
- CdrAddUsr.cpp:139:    return L"  <CdrAddUsrResp/>\n";
+ CdrCache.cpp:422:        nameXml = makeTermStart() + "</Term\n>";
+ CdrCache.cpp:444:                             "><PreferredName>" + pParent->getName() +
+ CdrCache.cpp:445:                             "</PreferredName></Term>\n";
+ CdrCache.cpp:450:        familyXml += "</Term>\n";
+ CdrCache.cpp:470:    termStart += cdrRef + ">\n <PreferredName>" + name + "</PreferredName>\n";
     See comment for CdrCache.cpp:315.  All of these would be potentially
     affected if I fix 315, so I've left them all alone.
+ CdrCache.cpp:542:    return cdr::String(L"</CdrCacheingResp>");
- CdrCheckAuth.cpp:64:        return L"  <CdrCheckAuthResp/>\n";
+ CdrCheckAuth.cpp:65:    cdr::String response = L"  <CdrCheckAuthResp>\n";
+ CdrCheckAuth.cpp:73:            response += L"   <Auth><Action>"
+ CdrCheckAuth.cpp:75:                     +  L"</Action>";
+ CdrCheckAuth.cpp:77:                response += L"<DocType>"
+ CdrCheckAuth.cpp:79:                         +  L"</DocType>";
+ CdrCheckAuth.cpp:80:            response += L"</Auth>\n";
+ CdrCheckAuth.cpp:83:    response += L"  </CdrCheckAuthResp>\n";
     All of above are returning ACTION strings like "ADD DOCUMENT", no real
      free text here.
+ CdrCommand.cpp:248:    return L"  <" + name + L"Resp>\n   <Stub>Got your Cdr" + name +
+ CdrCommand.cpp:249:           L" command ... can't process it yet.</Stub>\n  </"
+ CdrCtl.cpp:143:    return L"<" + setCtlRespStr + L"Resp/>";
- CdrDOMtoString.cpp:93:        result = "<?xml version='1.0' encoding='ISO-8859-1' ?>\n";
+ CdrDOMtoString.cpp:138:          result += "</" + nodeName + L'>';
+ CdrDOMtoString.cpp:163:        result = "<![CDATA[" + nodeValue + "]]>";
+ CdrDOMtoString.cpp:169:        result = "<!--" + nodeValue + "-->";
     The function DOMtoString looks like it could be called for data that
     would need entity conversion, but I can't find that it is ever called,
     anywhere.
     CVS documentation says Mike Rubenstein added this in 2000 but it was
     taken out of the system in 2002.
- CdrDbConnection.cpp:168:    rc = SQLConnect(hdbc, const_cast<SQLCHAR*>(dsn), SQL_NTS,
- CdrDbConnection.cpp:169:                          const_cast<SQLCHAR*>(uid), SQL_NTS,
- CdrDbConnection.cpp:170:                          const_cast<SQLCHAR*>(pwd), SQL_NTS);
- CdrDbConnection.cpp:223:      master(const_cast<Connection*>(&c))
- CdrDbConnection.cpp:244:    master      = const_cast<Connection*>(&c);
- CdrDbConnection.cpp:365:                                     reinterpret_cast<SQLPOINTER>(setting),
- CdrDbConnection.cpp:499:    return Connection(reinterpret_cast<const SQLCHAR*>(dsn.c_str()),
- CdrDbConnection.cpp:500:                      reinterpret_cast<const SQLCHAR*>(uid.c_str()),
- CdrDbConnection.cpp:501:                      reinterpret_cast<const SQLCHAR*>(pwd.c_str()),
- CdrDbPreparedStatement.cpp:93:    return static_cast<cdr::db::Statement*>(this)->executeQuery(query.c_str());
- CdrDbPreparedStatement.cpp:115:    return static_cast<cdr::db::Statement*>(this)->executeUpdate(query.c_str());
- CdrDbResultSet.cpp:185:    if (pos < 1 || pos > metaData.getColumnCount())
- CdrDbResultSet.cpp:251:    if (pos < 1 || pos > metaData.getColumnCount())
- CdrDelGrp.cpp:70:    return L"  <CdrDelGrpResp/>\n";
- CdrDelUsr.cpp:65:    return L"  <CdrDelUsrResp/>\n";
+ CdrDoc.cpp:1214:    cdr::String resp = cdr::String (L"  <Cdr") + rtag + L"DocResp>\n"
+ CdrDoc.cpp:1215:                     + L"   <DocId>" + doc.getTextId() + L"</DocId>\n"
+ CdrDoc.cpp:1237:    resp += L"  </Cdr" + rtag + L"DocResp>\n";
- CdrDoc.cpp:1295:                       + L"<CdrDocCtl>\n"
+ CdrDoc.cpp:1296:                       + L" <DocTitle>" + cdr::entConvert(title)
- CdrDoc.cpp:1297:                       + L"</DocTitle>\n"
- CdrDoc.cpp:1298:                       + L" <DocActiveStatus>" + activeStatus
- CdrDoc.cpp:1299:                       + L"</DocActiveStatus>\n"
- CdrDoc.cpp:1300:                       + L"</CdrDocCtl>\n"
- CdrDoc.cpp:1302:                       + L"\n</CdrDoc>\n";
- CdrDoc.cpp:1495:    cdr::String resp = L"  <CdrDelDocResp>\n"
- CdrDoc.cpp:1496:                       L"   <DocId>" + docIdStr + L"</DocId>\n";
- CdrDoc.cpp:1503:    return (resp + L"  </CdrDelDocResp>\n");
- CdrDoc.cpp:1638:    if (revFilterLevel < 1 || revFilterLevel > 3)
+ CdrDoc.cpp:1829:    cdr::String response = L" <CdrUpdateTitleResp>" +
+ CdrDoc.cpp:1831:                           L"</CdrUpdateTitleResp>\n";
- CdrDoc.cpp:2129:    return L"<CdrSetDocStatusResp/>";
- CdrDoc.cpp:2190:    return (L"<CdrReindexDocResp/>");
- CdrDoc.cpp:2715:        L"<?xml version='1.0'?>\n"
- CdrDoc.cpp:2720:        <!-- Identity rule, copies everything to the output tree. -->\nL"
- CdrDoc.cpp:2722:        L"<xsl:template match = '@*|node()'>\n"
- CdrDoc.cpp:2723:        L" <xsl:copy>\n"
- CdrDoc.cpp:2724:        L"  <xsl:apply-templates select = '@*|node()'/>\n"
- CdrDoc.cpp:2725:        L" </xsl:copy>\n"
- CdrDoc.cpp:2726:        L"</xsl:template>\n"
- CdrDoc.cpp:2741:          L"<xsl:element     name = '{name()}'>\n"
- CdrDoc.cpp:2742:           L"<xsl:if         test = 'not($cdrId)'>\n"
- CdrDoc.cpp:2743:            L"<xsl:attribute name = 'cdr:id'>@@DummyCdrId@@</xsl:attribute>\n"
- CdrDoc.cpp:2744:           L"</xsl:if>\n"
- CdrDoc.cpp:2745:           L"<xsl:apply-templates select = '@*|node()'/>\n"
- CdrDoc.cpp:2746:          L"</xsl:element>\n"
- CdrDoc.cpp:2747:         L"</xsl:template>\n"
- CdrDoc.cpp:2754:         L"<xsl:template     match = '@cdr:id'>\n"
- CdrDoc.cpp:2755:          L"<xsl:if          test = 'string(.)'>\n"
- CdrDoc.cpp:2756:           L"<xsl:copy/>\n"
- CdrDoc.cpp:2757:          L"</xsl:if>\n"
- CdrDoc.cpp:2758:         L"</xsl:template>\n"
- CdrDoc.cpp:2759:        L"</xsl:transform>\n";
- CdrDoc.cpp:3012:        query += " AND id <> ?";
- CdrDoc.cpp:3060:    os << L"<CdrMailerCleanupResp>";
- CdrDoc.cpp:3070:            os << L"<DeletedDoc>" << stringDocId(id) << L"</DeletedDoc>";
- CdrDoc.cpp:3081:    os << L"</CdrMailerCleanupResp>";
     An argument could be made for converting this, but I wasn't
     sure and left it alone.
- CdrDoc.cpp:3254:    bool    inComment;  // We're inside an xml <!-- ... --> comment
- CdrDocTypes.cpp:93:            response = L"  <CdrListDocTypesResp>\n";
+ CdrDocTypes.cpp:94:        response += L"   <DocType>" + name + L"</DocType>\n";
+ CdrDocTypes.cpp:97:        return L"  <CdrListDocTypesResp/>\n";
+ CdrDocTypes.cpp:99:        return response + L"  </CdrListDocTypesResp>\n";
+ CdrDocTypes.cpp:132:            response = L"<CdrListSchemaDocsResp>";
& CdrDocTypes.cpp:133:        response += L"<DocTitle>" + name + L"</DocTitle>";
     Fixed by Bob
+ CdrDocTypes.cpp:136:        return L"<CdrListSchemaDocsResp/>";
+ CdrDocTypes.cpp:138:        return response + L"</CdrListSchemaDocsResp>";
- CdrDocTypes.cpp:181:        static_cast<const cdr::dom::Element&>(node);
- CdrDocTypes.cpp:231:    std::auto_ptr<cdr::xsd::Schema> schemaPtr(schema);
- CdrDocTypes.cpp:246:         << L"'>";
- CdrDocTypes.cpp:248:        resp << L"<DocDtd><![CDATA["
+ CdrDocTypes.cpp:249:             << (schema ? schema->makeDtd(schemaName) : L"")
- CdrDocTypes.cpp:250:             << L"]]></DocDtd>";
- CdrDocTypes.cpp:251:    resp << L"<DocSchema>"
- CdrDocTypes.cpp:253:         << L"</DocSchema>";
+ CdrDocTypes.cpp:261:            resp << L"<EnumSet Node='" << i->first << L"'>";
+ CdrDocTypes.cpp:264:                resp << L"<ValidValue>" << cdr::entConvert(*j++)
+ CdrDocTypes.cpp:265:                     << L"</ValidValue>";
- CdrDocTypes.cpp:266:            resp << L"</EnumSet>";
- CdrDocTypes.cpp:271:        resp << L"<LinkingElements>";
+ CdrDocTypes.cpp:274:            resp << L"<LinkingElement>" << *iter++ << L"</LinkingElement>";
     Works because Element names can't have entities.
- CdrDocTypes.cpp:275:        resp << L"</LinkingElements>";
& CdrDocTypes.cpp:278:        resp << L"<Comment>" << comment << L"</Comment>";
     Extracting comment from the database and inserting it into serial XML.
- CdrDocTypes.cpp:279:    resp << L"</CdrGetDocTypeResp>";
- CdrDocTypes.cpp:305:        static_cast<const cdr::dom::Element&>(node);
- CdrDocTypes.cpp:406:    return L"<CdrAddDocTypeResp/>";
- CdrDocTypes.cpp:426:        static_cast<const cdr::dom::Element&>(node);
- CdrDocTypes.cpp:515:    return L"<CdrModDocTypeResp/>";
- CdrDocTypes.cpp:540:        static_cast<const cdr::dom::Element&>(node);
- CdrDocTypes.cpp:591:    return L"<CdrDelDocTypeResp/>";
- CdrDocTypes.cpp:620:    cdr::String resp = L"<CdrGetCssFiles>";
= CdrDocTypes.cpp:628:        resp += L"<File><Name>" + title + L"</Name><Data>"
     Fixed, see above
= CdrDocTypes.cpp:629:                                + css   + L"</Data></File>";
     Fixed, see above
- CdrDocTypes.cpp:633:    return resp + L"</CdrGetCssFiles>";
+ CdrDom.cpp:242:    pNode = static_cast<XERCES_CPP_NAMESPACE::DOMNode *>
+ CdrDom.cpp:299:            os << L"<?" << name << L" " << cdr::entConvert(value) << L"?>";
- CdrDom.cpp:303:            os << L"<?xml version='1.0' ?>";
- CdrDom.cpp:335:                os << L">";
? CdrDom.cpp:340:                os << L"</" << name << L">";
? CdrDom.cpp:343:                os << L"/>";
? CdrDom.cpp:356:            os << L"<![CDATA[" << value << L"]]>";
? CdrDom.cpp:359:            os << L"<!--" << value << L"-->";
     I'm not certain about the above '?' lines.  But if they were wrong, wouldn't
     we know about it by now?  Or would we?  This one is rather deep and I
     don't have time for a deep investigation right now.
- CdrExternalMap.cpp:97:    return L"<CdrAddExternalMappingResp/>\n";
- CdrFilter.cpp:69:                             vector<cdr::String>&  filters,
- CdrFilter.cpp:76:        vector<cdr::String>&   filterSet,
- CdrFilter.cpp:122:          result += static_cast<char>(c);
- CdrFilter.cpp:157:      vector<char*> parms;
- CdrFilter.cpp:424:      vector<UriInfo> uri_list;
- CdrFilter.cpp:455:        ThreadData* td = static_cast<ThreadData*>(thread_data);
- CdrFilter.cpp:481:              static_cast<ThreadData*>(thread_data)->filter_messages
+ CdrFilter.cpp:482:                += "<message>" + msg + "</message>\n";
     Think this is okay.
- CdrFilter.cpp:517:    ThreadData* thread_data = static_cast<ThreadData*>(data);
- CdrFilter.cpp:593:              && !isdigit(static_cast<unsigned char>(version_str[0]))
+ CdrFilter.cpp:630:          u.doc = "<CdrDocTitle>"
+ CdrFilter.cpp:632:                + "</CdrDocTitle>";
- CdrFilter.cpp:644:        u.doc = "<CdrDocCtl><NotFound>Y</NotFound></CdrDocCtl>";
- CdrFilter.cpp:664:        u.doc = "<DocId>" + thread_data->DocId.toUtf8() + "</DocId>";
- CdrFilter.cpp:679:        u.doc = string("<Date>") + buf + "</Date>";
+ CdrFilter.cpp:684:        u.doc = string("<PrettyUrl>") + getPrettyUrl(parms).toUtf8() +
+ CdrFilter.cpp:685:                      "</PrettyUrl>";
+ CdrFilter.cpp:749:    static_cast<ThreadData*>(data)->uri_list[handle].inuse = false;
     The getPrettyUrl() code rolls entity conversion by hand.  I decided to
      leave it alone rather than touch it.  It's only called in one place and
      it does work.  (Sometimes it seems wiser to make an exception than follow
      the rule.)
+ CdrFilter.cpp:758:    ThreadData* thread_data = static_cast<ThreadData*>(data);
- CdrFilter.cpp:790:    ThreadData* thread_data = static_cast<ThreadData*>(data);
- CdrFilter.cpp:1084:    vector<cdr::String> filters;
- CdrFilter.cpp:1128:  vector<cdr::String> filters;
- CdrFilter.cpp:1157:              static_cast<const cdr::dom::Element&>(child);
- CdrFilter.cpp:1202:              static_cast<const cdr::dom::Element&>(child);
- CdrFilter.cpp:1249:                pvector.push_back(pair<cdr::String, cdr::String>(name, value));
+ CdrFilter.cpp:1269:  result = output ? "<Document><![CDATA[" + result + "]]></Document>\n" : "";
+ CdrFilter.cpp:1271:    result += "<Messages>" + messages + "</Messages>\n";
     Think this is right.
+ CdrFilter.cpp:1273:  return L"<CdrFilterResp>"
+ CdrFilter.cpp:1275:       + L"</CdrFilterResp>\n";
- CdrFilter.cpp:1294:    vector<cdr::String>&  filters,
- CdrFilter.cpp:1358:    vector<cdr::String>&  filterSet,
- CdrFilter.cpp:1623:    L"<?xml version='1.0' encoding='utf-8'?>"
     See note above on getPrettyUrl() for this and following lines
- CdrFilter.cpp:1627:    L" <soap:Body>"
- CdrFilter.cpp:1629:    L"   <viewID>" + guid + L"</viewID>"
- CdrFilter.cpp:1630:    L"   <objectID/>"
- CdrFilter.cpp:1631:    L"  </ReturnPrettyURL>"
- CdrFilter.cpp:1632:    L" </soap:Body>"
- CdrFilter.cpp:1633:    L"</soap:Envelope>";
- CdrFilter.cpp:1701:                    static_cast<const cdr::dom::Element&>(child);
- CdrFilter.cpp:1711:                    static_cast<const cdr::dom::Element&>(child);
+ CdrFilter.cpp:1902:    response << L"<CdrGetFilterSetResp><FilterSetName>"
+ CdrFilter.cpp:1904:             << L"</FilterSetName><FilterSetDescription>"
+ CdrFilter.cpp:1906:             << L"</FilterSetDescription>";
+ CdrFilter.cpp:1908:        response << L"<FilterSetNotes>" << cdr::entConvert(notes)
+ CdrFilter.cpp:1909:                 << L"</FilterSetNotes>";
+ CdrFilter.cpp:1944:                     << L"'>"
+ CdrFilter.cpp:1946:                     << L"</Filter>";
+ CdrFilter.cpp:1951:                     << L"'>"
+ CdrFilter.cpp:1953:                     << L"</FilterSet>";
+ CdrFilter.cpp:1956:    response << L"</CdrGetFilterSetResp>";
- CdrFilter.cpp:2033:    return L"<CdrDelFilterSetResp/>";
- CdrFilter.cpp:2053:    response << L"<CdrGetFilterSetsResp>";
- CdrFilter.cpp:2065:                 << L"'>"
+ CdrFilter.cpp:2067:                 << L"</FilterSet>";
+ CdrFilter.cpp:2069:    response << L"</CdrGetFilterSetsResp>";
+ CdrFilter.cpp:2090:    response << L"<CdrGetFiltersResp>";
+ CdrFilter.cpp:2105:                 << L"'>"
+ CdrFilter.cpp:2107:                 << L"</Filter>";
+ CdrFilter.cpp:2109:    response << L"</CdrGetFiltersResp>";
- CdrFilter.cpp:2179:        return "<PubVerNumber>0</PubVerNumber>";
- CdrFilter.cpp:2182:        return "<PubVerNumber>0</PubVerNumber>";
- CdrFilter.cpp:2194:        return "<PubVerNumber>0</PubVerNumber>";
- CdrFilter.cpp:2197:    os << "<PubVerNumber>" << versionNum << "</PubVerNumber>";
- CdrFilter.cpp:2206:        return "<ValidZip/>";
- CdrFilter.cpp:2213:        return "<ValidZip/>";
- CdrFilter.cpp:2215:    os << "<ValidZip>" << parms.substr(0, 5) << "</ValidZip>";
- CdrFilter.cpp:2277:        return "<VerificationDate>" + latestDate.substr(0, 10)
- CdrFilter.cpp:2278:             + "</VerificationDate>";
- CdrFilter.cpp:2280:        return "<VerificationDate>" + lastModDate.substr(0, 10)
- CdrFilter.cpp:2281:             + "</VerificationDate>";
- CdrFilter.cpp:2285:        return "<VerificationDate>" + dateFirstPub.toUtf8().substr(0, 10)
- CdrFilter.cpp:2286:             + "</VerificationDate>";
- CdrFilter.cpp:2287:    return "<VerificationDate/>";
- CdrFilter.cpp:2332:    vector<string> qryParms;
+ CdrFilter.cpp:2335:    string result("<?xml version='1.0' encoding='UTF-8'?>\n<SqlResult>");
- CdrFilter.cpp:2393:    vector<string> colNames;
- CdrFilter.cpp:2404:        sprintf(buf, "\n <row id='%d'>", rowId);
& CdrFilter.cpp:2419:                result += ">" + wValue.toUtf8() + "</col>";
     Fixed along with fix on line 2409
- CdrFilter.cpp:2423:        result += "\n </row>";
- CdrFilter.cpp:2428:    result += "\n</SqlResult>";
- CdrFilter.cpp:2529:        result = "<?xml version='1.0' encoding='UTF-8'?>\n<result>\n";
- CdrFilter.cpp:2532:                result += " <id>";
- CdrFilter.cpp:2534:                result += "</id>\n";
- CdrFilter.cpp:2538:        result += "</result>\n";
- CdrFilter.cpp:2673:        return "<DocId/>";
- CdrFilter.cpp:2682:        return "<DocId>DROP</DocId>";
- CdrFilter.cpp:2690:        return "<DocId/>";
- CdrFilter.cpp:2694:    os << "<DocId>" << idString.toUtf8() << "</DocId>";
- CdrGetDoc.cpp:200:                       + L"'>\n<CdrDocCtl>\n";
- CdrGetDoc.cpp:214:    cdrDoc += L"</CdrDocCtl>\n";
- CdrGetDoc.cpp:239:    cdrDoc += L"</CdrDoc>\n";
- CdrGetDoc.cpp:300:                       + L"'>\n<CdrDocCtl>\n";
+ CdrGetDoc.cpp:321:    cdrDoc += L"</CdrDocCtl>\n";
+ CdrGetDoc.cpp:335:    cdrDoc += L"</CdrDoc>\n";
- CdrGetDoc.cpp:408:    return (L"<CdrDocXml><![CDATA[" + xml +  L"]]>\n</CdrDocXml>\n");
- CdrGetDoc.cpp:433:    return (L"<CdrDocBlob encoding='base64'>"
- CdrGetDoc.cpp:434:            +  encodedBlob +  L"\n</CdrDocBlob>\n");
- CdrGetDoc.cpp:473:    cdr::String cdrDoc = cdr::String(L"<DocValStatus>")
- CdrGetDoc.cpp:475:                       + L"</DocValStatus>";
- CdrGetDoc.cpp:479:        cdrDoc += cdr::String(L"<DocValDate>") + valDate + L"</DocValDate>";
& CdrGetDoc.cpp:481:    cdrDoc += cdr::String(L"<DocTitle>") + title + L"</DocTitle>";
     Fixed as part of line 321
& CdrGetDoc.cpp:483:        cdrDoc += cdr::String(L"<DocComment>") + comment + L"</DocComment>";
     Fixed as part of line 467
& CdrGetDoc.cpp:485:    cdrDoc += L"<ReadyForReview>" + rrString + L"</ReadyForReview>";
     Fixed as part of line 468
- CdrGetDoc.cpp:487:    return L"<CdrDocCtl>" + cdrDoc
- CdrGetDoc.cpp:489:         + L"</CdrDocCtl>\n";
- CdrGetDoc.cpp:528:  cdr::String cdrDoc = cdr::String(L"<DocValStatus>")
- CdrGetDoc.cpp:530:    + L"</DocValStatus>";
- CdrGetDoc.cpp:534:    cdrDoc += cdr::String(L"<DocValDate>") + valDate + L"</DocValDate>";
& CdrGetDoc.cpp:536:  cdrDoc += cdr::String(L"<DocTitle>") + title + L"</DocTitle>";
     Fixed as part of line 523
& CdrGetDoc.cpp:538:    cdrDoc += cdr::String(L"<DocComment>") + comment + L"</DocComment>";
     Fixed as part of line 524
- CdrGetDoc.cpp:540:  return L"<CdrDocCtl>" + cdrDoc
- CdrGetDoc.cpp:542:       + L"</CdrDocCtl>\n";
- CdrGetDoc.cpp:596:      cdrDoc += L"<Create><Date>" + date + L"</Date><User>"
- CdrGetDoc.cpp:597:              + user + L"</User></Create>";
- CdrGetDoc.cpp:624:      cdrDoc += L"<Modify><Date>" + date + L"</Date><User>"
- CdrGetDoc.cpp:625:              + user + L"</User></Modify>";
- CdrGetDoc.cpp:634:      cdrDoc += L"<FirstPub><Date>" + date + L"</Date></FirstPub>";
- CdrGetDoc.cpp:719:  cdr::String lock = "N";           // Default value of <lock> element
- CdrGetDoc.cpp:721:  cdr::String version = L"0";       // Default value of <Version> element
- CdrGetDoc.cpp:730:        static_cast<const cdr::dom::Element&>(commandNode);
- CdrGetDoc.cpp:873:  cdr::String docStr = L"<CdrGetDocResp>\n" + readOnlyWrap (idStr, L"DocId");
& CdrGetDoc.cpp:924:  return (docStr + L"</CdrGetDocResp>\n");
+ CdrGetGrp.cpp:60:    cdr::String response = cdr::String(L"  <CdrGetGrpResp>\n"
+ CdrGetGrp.cpp:61:                                       L"   <GrpName>")
+ CdrGetGrp.cpp:63:                                     + L"</GrpName>\n";
- CdrGetGrp.cpp:80:        response += L"   <Auth><Action>" +  action + L"</Action>";
- CdrGetGrp.cpp:82:            response += L"<DocType>" +  docType + L"</DocType>";
- CdrGetGrp.cpp:83:        response += L"</Auth>\n";
- CdrGetGrp.cpp:98:        response += L"   <UserName>" + usrRs.getString(1) + L"</UserName>\n";
& CdrGetGrp.cpp:102:        response += L"   <Comment>" + comment + L"</Comment>\n";
     Comment is the only field that could have reserved entity chars in this
- CdrGetGrp.cpp:106:    return response + L"  </CdrGetGrpResp>\n";
+ CdrGetTree.cpp:51:    resp << L"<CdrGetTreeResp>\n";
- CdrGetTree.cpp:61:    resp << L"<Pairs>\n";
- CdrGetTree.cpp:65:        resp << L"<Pair><Child>" << child << L"</Child>"
- CdrGetTree.cpp:66:             << L"<Parent>" << parent << L"</Parent></Pair>\n";
- CdrGetTree.cpp:68:    resp << L"</Pairs>\n";
- CdrGetTree.cpp:71:    resp << L"<Terms>\n";
- CdrGetTree.cpp:78:        resp << L"<Term><Id>" << id << L"</Id>"
& CdrGetTree.cpp:79:             << L"<Name>" << title << L"</Name></Term>\n";
     Term can have chars.  Fixed.  Rest of what goes into the XML are integers
- CdrGetTree.cpp:81:    resp << L"</Terms>\n";
- CdrGetTree.cpp:84:    resp << L"</CdrGetTreeResp>\n";
& CdrGetUsr.cpp:87:    cdr::String response = cdr::String(L"  <CdrGetUsrResp>\n"
& CdrGetUsr.cpp:88:                                       L"   <UserName>")
& CdrGetUsr.cpp:90:                                     + L"</UserName>\n"
& CdrGetUsr.cpp:91:                                     + L"   <Password>"
& CdrGetUsr.cpp:93:                                     + L"</Password>\n";
& CdrGetUsr.cpp:95:        response += L"   <FullName>"
& CdrGetUsr.cpp:97:                 +  L"</FullName>\n";
& CdrGetUsr.cpp:99:        response += L"   <Office>"
& CdrGetUsr.cpp:101:                 +  L"</Office>\n";
& CdrGetUsr.cpp:103:        response += L"   <Email>"
& CdrGetUsr.cpp:105:                 +  L"</Email>\n";
& CdrGetUsr.cpp:107:        response += L"   <Phone>"
& CdrGetUsr.cpp:109:                 +  L"</Phone>\n";
& CdrGetUsr.cpp:121:        response += L"   <GrpName>" + grpRs.getString(1) + L"</GrpName>\n";
& CdrGetUsr.cpp:125:        response += L"   <Comment>" + comment + L"</Comment>\n";
& CdrGetUsr.cpp:128:    return response + L"  </CdrGetUsrResp>\n";
     Modified all of these fields to convert entities.  Should never be
     necessary for phone numbers or group names but so many do need change
     that it's not much extra change to do them all.
+ CdrGlossaryMap.cpp:59:    response << L"<CdrGetGlossaryMapResp>";
+ CdrGlossaryMap.cpp:83:        response << L"<Term id='" << term->first << L"'>";
+ CdrGlossaryMap.cpp:84:        response << L"<Name>" << cdr::entConvert(name) << L"</Name>";
+ CdrGlossaryMap.cpp:87:            response << L"<Phrase>" << cdr::entConvert(*phrase)
+ CdrGlossaryMap.cpp:88:                     << L"</Phrase>";
+ CdrGlossaryMap.cpp:91:        response << L"</Term>";
+ CdrGlossaryMap.cpp:96:    response << L"</CdrGetGlossaryMapResp>";
+ CdrGlossaryMap.cpp:118:    response << L"<CdrGetSpanishGlossaryMapResp>";
+ CdrGlossaryMap.cpp:142:        response << L"<Term id='" << term->first << L"'>";
+ CdrGlossaryMap.cpp:143:        response << L"<Name>" << cdr::entConvert(name) << L"</Name>";
+ CdrGlossaryMap.cpp:146:            response << L"<Phrase>" << cdr::entConvert(*phrase)
+ CdrGlossaryMap.cpp:147:                     << L"</Phrase>";
+ CdrGlossaryMap.cpp:150:        response << L"</Term>";
+ CdrGlossaryMap.cpp:155:    response << L"</CdrGetSpanishGlossaryMapResp>";
- CdrGlossaryMap.cpp:190:        "            AND s.value <> 'Rejected'                       "
- CdrGlossaryMap.cpp:191:        "            AND (e.value IS NULL OR e.value <> 'Yes')       ";
+ CdrGlossaryMap.cpp:261:        if (wcschr(L"'\".,?!:;()[]{}<>\x201C\x201D\x00A1\x00BF", p[i]))
     This is the place referred to in lines 83 and 142.  No '&' in the
      normalization, so entConvert would still seem to be required.
- CdrLink.cpp:283:             = static_cast<const cdr::dom::Element&> (fldNode);
- CdrLink.cpp:661:    cdr::String resp  = L"<CdrGetLinksRes>\n"
- CdrLink.cpp:662:                        L"  <DocID>" + docIdStr + L"</DocID>\n"
- CdrLink.cpp:663:                        L"  <LnkList>\n"
- CdrLink.cpp:664:                        L"    <LnkCount>";
- CdrLink.cpp:665:                resp += errCount + L"</LnkCount>\n";
- CdrLink.cpp:675:    resp += L"  </LnkList>\n"
- CdrLink.cpp:676:            L"</CdrGetLinksRes>\n";
+ CdrLink.cpp:696:    xml = L"<LnkItem>";
+ CdrLink.cpp:759:    xml += L"</LnkItem>";
- CdrLink.cpp:886:    std::wcout << "DocId=" << docObj->getId()
- CdrLink.cpp:887:               << "  DocTypeStr=" << docObj->getTextDocType()
- CdrLink.cpp:1180:    return (L"<" + cmdName + L"Resp/>");
- CdrLink.cpp:1231:    cdr::String resp = "<CdrGetLinkTypeResp>\n";
- CdrLink.cpp:1232:    resp += L"  <Name>" + linkName + L"</Name>\n";
- CdrLink.cpp:1233:    resp += L"  <LinkChkType>" + linkName + L"</LinkChkType>\n";
& CdrLink.cpp:1235:        resp += L"  <LinkTypeComment>" + comment +  L"</LinkTypeComment>\n";
     Comment from database was not encoded.
+ CdrLink.cpp:1249:        resp += L"  <LinkSource>\n";
+ CdrLink.cpp:1252:        resp += L"  </LinkSource>\n";
+ CdrLink.cpp:1266:        resp += L"  <TargetDocType>" + xrs.getString(1) + L"</TargetDocType>\n";
& CdrLink.cpp:1278:        resp += L"  <LinkProperties>\n";
     Fixed two failures to convert property and property comment in this section.
& CdrLink.cpp:1287:        resp += L"  </LinkProperties>\n";
     Fixed two failures to convert property and property comment in this section.
+ CdrLink.cpp:1291:    resp += L"</CdrGetLinkTypeResp>";
+ CdrLink.cpp:1312:    cdr::String resp = L"<CdrListLinkTypesResp>\n";
+ CdrLink.cpp:1319:    resp += L"</CdrListLinkTypesResp>";
+ CdrLink.cpp:1339:    cdr::String resp = L"<CdrListLinkPropsResp>\n";
+ CdrLink.cpp:1344:        resp += L"  <LinkProperty>/n";
& CdrLink.cpp:1350:        resp += L"  </LinkProperty>/n";
     See fix on line 1349
+ CdrLink.cpp:1350:        resp += L"  </LinkProperty>/n";
+ CdrLink.cpp:1354:    resp += L"</CdrListLinkPropsResp>";
- CdrLink.cpp:1612:                     = static_cast<const cdr::dom::Element&> (node);
- CdrLink.cpp:2213:    cdr::String response = L"<CdrSearchLinksResp>";
- CdrLink.cpp:2220:            response += L"<QueryResults>";
- CdrLink.cpp:2222:        swprintf(tmp, L"<QueryResult><DocId>CDR%010ld</DocId>"
+ CdrLink.cpp:2223:                      L"<DocTitle>%.500s</DocTitle>"
+ CdrLink.cpp:2224:                      L"</QueryResult>",
+ CdrLink.cpp:2229:        response += L"</QueryResults></CdrSearchLinksResp>";
+ CdrLink.cpp:2231:        response += L"<QueryResults/></CdrSearchLinksResp>";
+ CdrLink.cpp:2331:    String rsp = L"<CdrPasteLinkResp><DenormalizedContent>"
& CdrLink.cpp:2333:               + L"</DenormalizedContent></CdrPasteLinkResp>";
     Fixed return of a title.
- CdrLinkProcs.cpp:859:                static_cast<cdr::link::LinkChkRelation*> (this);
- CdrLinkProcs.cpp:901:                    static_cast<cdr::link::LinkChkPair*> (this);
- CdrLinkProcs.cpp:978:    cdr::String response = L"<CdrSearchLinksResp>";
- CdrLinkProcs.cpp:985:            response += L"<QueryResults>";
- CdrLinkProcs.cpp:987:        swprintf(tmp, L"<QueryResult><DocId>CDR%010ld</DocId>"
+ CdrLinkProcs.cpp:988:                      L"<DocTitle>%.500s</DocTitle>"
+ CdrLinkProcs.cpp:989:                      L"</QueryResult>",
+ CdrLinkProcs.cpp:994:        response += L"</QueryResults></CdrSearchLinksResp>";
+ CdrLinkProcs.cpp:996:        response += L"<QueryResults/></CdrSearchLinksResp>";
+ CdrListGrps.cpp:34:            response = L"  <CdrListGrpsResp>\n";
+ CdrListGrps.cpp:35:        response += L"   <GrpName>" + r.getString(1) + L"</GrpName>\n";
+ CdrListGrps.cpp:38:        return L"  <CdrListGrpsResp/>\n";
+ CdrListGrps.cpp:40:        return response + L"  </CdrListGrpsResp>\n";
+ CdrListUsrs.cpp:46:            response = L"  <CdrListUsrsResp>\n";
& CdrListUsrs.cpp:47:        response += L"   <UserName>" + r.getString(1) + L"</UserName>\n";
     Unnecessary but did it anyway.
+ CdrListUsrs.cpp:50:        return L"  <CdrListUsrsResp/>\n";
+ CdrListUsrs.cpp:52:        return response + L"  </CdrListUsrsResp>\n";
+ CdrLog.cpp:504:    os << L"<CdrLogClientEventResp><EventId>" << eventId
+ CdrLog.cpp:505:       << L"</EventId></CdrLogClientEventResp>";
+ CdrLogoff.cpp:46:    return L"  <CdrLogoffResp/>\n";
+ CdrLogon.cpp:108:    cdr::String response = L"  <CdrLogonResp>\n   <SessionId>";
+ CdrLogon.cpp:109:    response += sessionId + L"</SessionId>\n  </CdrLogonResp>\n";
+ CdrLogon.cpp:135:    cdr::String response = L"  <CdrDupSessionResp>\n";
+ CdrLogon.cpp:136:    response += L"   <sessionId>" + oldSessionName + L"</SessionId>\n";
+ CdrLogon.cpp:137:    response += L"   <newSessionId>" + newSessionName + L"</newSessionId>\n";
+ CdrLogon.cpp:138:    response += L"  </CdrDupSessionResp>\n";
     Session identifiers use a restricted, safe, character set.
+ CdrMergeProt.cpp:196:        os << L"<" << ppdName << L">";
- CdrMergeProt.cpp:198:            os << L"<ProcessingStatuses>";
+ CdrMergeProt.cpp:202:            os << L"</ProcessingStatuses>";
     Safe because the content are controlled strings we defined
     (for some values of "safe")
+ CdrMergeProt.cpp:205:            os << L"<MissingRequiredInformation>";
+ CdrMergeProt.cpp:210:                os << L"<MissingInformation>" << encoded.c_str()
+ CdrMergeProt.cpp:211:                   << L"</MissingInformation>";
+ CdrMergeProt.cpp:214:            os << L"</MissingRequiredInformation>";
+ CdrMergeProt.cpp:216:        os << L"</" << ppdName << L">";
     Controlled names again
? CdrMergeProt.cpp:357:    os << L">";
     See attrValue on line 354.  Should it be converted?
     Probably never needed but in theory could be.  Have I misinterpreted
     what's going on and broken something??
? CdrMergeProt.cpp:463:    os << L"</" << topElementName << L">";
     Line 464 looks unsafe to me, but surely the CdrServer would have blown up
     if it is.  Maybe I'm too tired right now.
+ CdrMergeProt.cpp:469:    return L"<CdrMergeProt/>";
+ CdrMergeProt.cpp:587:    cdr::String cmd = L"<CdrDelDoc><DocId>"
+ CdrMergeProt.cpp:589:                    + L"</DocId><Validate>N</Validate><Reason>Merged with "
+ CdrMergeProt.cpp:591:                    + L".</Reason></CdrDelDoc>";
+ CdrMergeProt.cpp:602:    size_t pos = rsp.find(L"<Errors>");
- CdrMergeProt.cpp:628:    cdr::String cmd = L"<CdrGetDoc><DocId>"
- CdrMergeProt.cpp:630:                    + L"</DocId><Lock>Y</Lock><Version>Current</Version>"
- CdrMergeProt.cpp:631:                      L"</CdrGetDoc>";
- CdrMergeProt.cpp:642:            if (rsp.find(L"<Errors>") == rsp.npos)
- CdrMergeProt.cpp:678:                       + L"'><CdrDocXml><![CDATA["
- CdrMergeProt.cpp:680:                       + L"]]></CdrDocXml></CdrDoc>";
- CdrMergeProt.cpp:683:    cdr::String cmd = L"<CdrRepDoc><CheckIn>Y</CheckIn><Validate>N</Validate>"
- CdrMergeProt.cpp:684:                      L"<Reason>Absorbed ScientificProtocolInfo document "
+ CdrMergeProt.cpp:686:                    + L".</Reason><Version>N</Version>"
? CdrMergeProt.cpp:688:                    + L"</CdrRepDoc>";
     Looks to me like the safety of this depends on the nature of scientific
     protocol info.  Same issue as on 463 above.
- CdrModGrp.cpp:22:typedef std::list<Auth> AuthList;
- CdrModGrp.cpp:166:    return L"  <CdrModGrpResp/>\n";
- CdrModUsr.cpp:144:    return L"  <CdrModUsrResp/>\n";
- CdrPublish.cpp:167:                                static_cast<const dom::Element&>(doc);
- CdrPublish.cpp:324:    return L"<CdrPublishResp><JobId>" + String::toString(jobId) +
- CdrPublish.cpp:325:           L"</JobId></CdrPublishResp>";
- CdrReport.cpp:50:map<cdr::String, cdr::Report*> cdr::Report::reportMap;
- CdrReport.cpp:135:  return L"<CdrReportResp>"
- CdrReport.cpp:137:       + L"</CdrReportResp>";
- CdrReport.cpp:463:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:464:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:473:      result << L"<ReportRow>\n"
- CdrReport.cpp:474:                L"<DocId>" << cdr::stringDocId(id) << L"</DocId>\n"
- CdrReport.cpp:475:                L"<DocType>" << dtype << L"</DocType>\n"
- CdrReport.cpp:476:                L"<CheckedOutTo>" << name << L"</CheckedOutTo>\n"
- CdrReport.cpp:477:                L"<WhenCheckedOut>" << dt_out << L"</WhenCheckedOut>\n"
- CdrReport.cpp:478:                L"<LastActivity>\n"
- CdrReport.cpp:479:                L"<ActionType>" << aname << L"</ActionType>\n"
- CdrReport.cpp:480:                L"<ActionWhen>" << dt << L"</ActionWhen>\n"
- CdrReport.cpp:481:                L"</LastActivity>\n"
- CdrReport.cpp:482:                L"</ReportRow>\n";
- CdrReport.cpp:485:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:515:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:516:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:522:      result << L"<ReportRow>\n"
- CdrReport.cpp:523:                L"<DocId>" << cdr::stringDocId(id) << L"</DocId>\n"
- CdrReport.cpp:524:                L"<DocType>" << dtype << L"</DocType>\n"
- CdrReport.cpp:525:                L"<WhenCheckedOut>" << dt_out << L"</WhenCheckedOut>\n"
- CdrReport.cpp:526:                L"</ReportRow>\n";
- CdrReport.cpp:529:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:569:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:570:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:591:          result << L"<ReportRow>\n"
- CdrReport.cpp:592:                    L"<DocId>" << cdr::stringDocId(currentId) << L"</DocId>\n"
+ CdrReport.cpp:593:                    L"<DocTitle>" << currentTitle << L"</DocTitle>\n"
     Fixed by Bob
& CdrReport.cpp:594:                    L"<Group>" << group << L"</Group>\n"
     Fix is probably never required but not absolutely certain.  And it doesn't hurt.
- CdrReport.cpp:595:                    L"</ReportRow>\n";
- CdrReport.cpp:618:      result << L"<ReportRow>\n"
- CdrReport.cpp:619:                L"<DocId>" << cdr::stringDocId(currentId) << L"</DocId>\n"
+ CdrReport.cpp:620:                L"<DocTitle>" << currentTitle << L"</DocTitle>\n"
     Fixed by Bob
& CdrReport.cpp:621:                L"<Group>" << group << L"</Group>\n"
     Fix is probably never required but not absolutely certain.  And it doesn't hurt.
- CdrReport.cpp:622:                L"</ReportRow>\n";
- CdrReport.cpp:624:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:661:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:662:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:667:      result << L"<ReportRow>\n"
- CdrReport.cpp:668:                L"<DocId>" << cdr::stringDocId(id) << L"</DocId>\n"
+ CdrReport.cpp:669:                L"<DocTitle>" << title << L"</DocTitle>\n"
     Fixed by Bob
- CdrReport.cpp:670:                L"</ReportRow>\n";
- CdrReport.cpp:673:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:702:    size_t endTag = report.find(L"</ReportBody>", startTag);
- CdrReport.cpp:706:    cdr::String result = L"<ReportBody><![CDATA["
- CdrReport.cpp:708:                       + L"]]></ReportBody>";
- CdrReport.cpp:741:    size_t endTag = report.find(L"</ReportBody>", tagClose);
- CdrReport.cpp:746:    cdr::String result = L"<ReportBody><![CDATA["
- CdrReport.cpp:748:                       + L"]]></ReportBody>";
- CdrReport.cpp:768:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:769:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:783:          groupElem = L"<CoopMember>Main</CoopMember>";
- CdrReport.cpp:785:          groupElem = L"<CoopMember>Affiliate</CoopMember>";
- CdrReport.cpp:787:          result << L"</ReportRow>";
- CdrReport.cpp:788:        result << L"<ReportRow><DocId>"
- CdrReport.cpp:790:               << L"</DocId><DocTitle>"
+ CdrReport.cpp:792:               << L"</DocTitle>"
+ CdrReport.cpp:801:               << L"'>"
+ CdrReport.cpp:803:               << L"</PI>";
     Left piName alone on the theory that no human will have a name with &<>
     in it.
- CdrReport.cpp:807:      result << L"</ReportRow>";
- CdrReport.cpp:809:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:841:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:842:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:862:      result << L"<ReportRow><DocId>"
+ CdrReport.cpp:864:             << L"</DocId><DocTitle>"
+ CdrReport.cpp:866:             << L"</DocTitle>"
- CdrReport.cpp:868:             << L"</ReportRow>";
- CdrReport.cpp:871:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:927:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:928:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:938:      result << L"<MenuItem><TermId>"
+ CdrReport.cpp:940:             << L"</TermId><TermName>"
+ CdrReport.cpp:942:             << L"</TermName><MenuType>"
+ CdrReport.cpp:944:             << L"</MenuType><MenuStatus>"
+ CdrReport.cpp:946:             << L"</MenuStatus>";
+ CdrReport.cpp:948:          result << L"<DisplayName>"
+ CdrReport.cpp:950:                 << L"</DisplayName>";
- CdrReport.cpp:952:          result << L"<ParentId>"
- CdrReport.cpp:954:                 << L"</ParentId>";
+ CdrReport.cpp:955:      result << L"<SortString>"
+ CdrReport.cpp:957:             << L"</SortString>";
+ CdrReport.cpp:958:      result << L"</MenuItem>\n";
- CdrReport.cpp:960:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:993:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:994:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1010:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:1050:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1051:              L"<ReportName>" << getName() << L"</ReportName>\n";
+ CdrReport.cpp:1057:        result << L"<Value Loc='" << loc << "'>"
+ CdrReport.cpp:1058:               << cdr::entConvert(value) << L"</Value>\n";
+ CdrReport.cpp:1060:        result << L"<Value Loc='" << loc << L"'/>\n";
- CdrReport.cpp:1065:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:1097:                   "          WHERE t.name <> 'Citation' ";
- CdrReport.cpp:1116:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1117:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1140:      result << L"<ReportRow><DocId>"
+ CdrReport.cpp:1142:             << L"</DocId><DocTitle>"
+ CdrReport.cpp:1144:             << L"</DocTitle>"
- CdrReport.cpp:1146:             << L"</ReportRow>";
- CdrReport.cpp:1150:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:1196:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1197:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1202:    result << L"<TranslatedSummary>"
- CdrReport.cpp:1204:           << L"</TranslatedSummary>\n]]></ReportBody>\n";
- CdrReport.cpp:1228:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1229:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1233:    result << L"<PatientSummary>"
- CdrReport.cpp:1235:           << L"</PatientSummary>\n]]></ReportBody>\n";
- CdrReport.cpp:1260:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1261:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1265:    result << L"<BoardMember>"
- CdrReport.cpp:1267:           << L"</BoardMember>\n]]></ReportBody>\n";
- CdrReport.cpp:1295:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1296:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1302:               << L"'>"
+ CdrReport.cpp:1304:               << L"</GlossaryTermName>\n";
+ CdrReport.cpp:1306:    result << L"]]></ReportBody>\n";
- CdrReport.cpp:1340:    result << L"<ReportBody><![CDATA[\n"
- CdrReport.cpp:1341:              L"<ReportName>" << getName() << L"</ReportName>\n";
- CdrReport.cpp:1345:        result << L"<ReportRow><DocId>"
+ CdrReport.cpp:1347:               << L"</DocId><DocTitle>"
- CdrReport.cpp:1349:               << L"</DocTitle></ReportRow>\n";
- CdrReport.cpp:1351:    result << L"]]></ReportBody>\n";
- CdrSearch.cpp:77:                        static_cast<const cdr::dom::Element&>(child);
- CdrSearch.cpp:90:        CdrSearchparse(static_cast<void*>(&qp));
- CdrSearch.cpp:117:    cdr::String response = L"  <CdrSearchResp>\n";
- CdrSearch.cpp:122:            response += L"   <QueryResults>\n";
- CdrSearch.cpp:127:        swprintf(tmp, L"    <QueryResult>\n     <DocId>CDR%010ld</DocId>\n"
- CdrSearch.cpp:128:                      L"     <DocType>%s</DocType>\n"
& CdrSearch.cpp:129:                      L"     <DocTitle>%.500s</DocTitle>\n"
     Changed above and below for new convention, entConvert on output only.
+ CdrSearch.cpp:130:                      L"    </QueryResult>\n", 
+ CdrSearch.cpp:135:        response += L"   </QueryResults>\n  </CdrSearchResp>\n";
+ CdrSearch.cpp:137:        response += L"   <QueryResults/>\n  </CdrSearchResp>\n";
- CdrSearch.cpp:195:            str[j++] = static_cast<char>(sql[i++]);
- CdrSearch.cpp:398:                static_cast<const cdr::dom::Element&>(node);
- CdrSearch.cpp:461:            response = L"<CdrListQueryTermRulesResp>";
+ CdrSearch.cpp:462:        response += L"<Rule>" + r.getString(1) + L"</Rule>";
+ CdrSearch.cpp:467:        response = L"<CdrListQueryTermRulesResp/>";
+ CdrSearch.cpp:469:        response += L"</CdrListQueryTermRulesResp>";
+ CdrSearch.cpp:506:            response = L"<CdrListQueryTermDefsResp>";
+ CdrSearch.cpp:507:        response += L"<Definition><Path>" + path + L"</Path>";
+ CdrSearch.cpp:509:            response += L"<Rule>" + rule + L"</Rule>";
+ CdrSearch.cpp:510:        response += L"</Definition>";
+ CdrSearch.cpp:515:        response = L"<CdrListQueryTermDefsResp/>";
+ CdrSearch.cpp:517:        response += L"</CdrListQueryTermDefsResp>";
+ CdrSearch.cpp:612:    return L"<CdrAddQueryTermDef/>";
- CdrSearch.cpp:692:    return L"<CdrDelQueryTermDef/>";
- CdrServer.cpp:316:        std::cout << "client IP address: " << threadArgs->clientAddress
- CdrServer.cpp:608:    sprintf(blobTag, "<CdrDocBlob size='%u'/>", blobLen);
- CdrServer.cpp:653:        cdr::String response = L"<CdrResponseSet Time='" + when + L"'>\n";
+ CdrServer.cpp:677:        response += L"</CdrResponseSet>\n";
     Returning XML constructed in lower level commands
& CdrServer.cpp:709:                         + L"'>\n <Errors>\n  <Err>"
     All calls to sendErrorResponse except one send known safe error messages,
     but the one that doesn't reports exception message, which could contain
     anything.  So I converted this line.
+ CdrServer.cpp:711:                         + L"</Err>\n </Errors>\n</CdrResponseSet>\n";
- CdrServer.cpp:725:    const cdr::dom::Element& cmdElement = static_cast<const cdr::dom::Element&>
+ CdrServer.cpp:753:                                          + L"'>\n  <Errors>\n   "
+ CdrServer.cpp:754:                                          + L"<Err>Unknown command: "
+ CdrServer.cpp:756:                                          + L"</Err>\n  </Errors>\n"
+ CdrServer.cpp:757:                                          + L" </CdrResponse>\n");
+ CdrServer.cpp:773:                                              + L"   <Errors>\n    <Err>"
+ CdrServer.cpp:775:                                              + L"</Err>\n   </Errors>\n"
+ CdrServer.cpp:778:                                              + L"Resp>\n </CdrResponse>\n");
+ CdrServer.cpp:797:                                          + L"   <Errors>\n    <Err>"
+ CdrServer.cpp:799:                                          + L"</Err>\n   </Errors>\n"
+ CdrServer.cpp:802:                                          + L"Resp>\n </CdrResponse>\n");
+ CdrServer.cpp:815:                                          + L"Resp><Errors><Err>"
+ CdrServer.cpp:818:                                          + L"</Err></Errors></"
+ CdrServer.cpp:820:                                          + L"Resp></CdrResponse>");
+ CdrServer.cpp:836:                                          + L"Resp><Errors>"
+ CdrServer.cpp:837:                                          + L"<Err>SAX Parse Exception: "
+ CdrServer.cpp:840:                                          + L"</Err></Errors></"
+ CdrServer.cpp:842:                                          + L"Resp></CdrResponse>");
+ CdrServer.cpp:852:                                          + L"Resp><Errors><Err>SAX Exception: "
+ CdrServer.cpp:854:                                          + L"</Err></Errors></"
+ CdrServer.cpp:856:                                          + L"Resp></CdrResponse>");
+ CdrServer.cpp:866:                                          + L"Resp><Errors><Err>Unexpected "
+ CdrServer.cpp:868:                                            L"</Err></Errors></"
+ CdrServer.cpp:870:                                          + L"Resp></CdrResponse>");
+ CdrServer.cpp:878:                                          + L" </CdrResponse>\n";
+ CdrServer.cpp:891:                              + L"'>\n  <Errors>\n   "
+ CdrServer.cpp:892:                              + L"<Err>Missing specific command element"
+ CdrServer.cpp:893:                              + L"</Err>\n  </Errors>\n"
+ CdrServer.cpp:894:                              + L" </CdrResponse>\n");
+ CdrServer.cpp:920:                        "   AND name <> 'guest'"
& CdrServer.cpp
     Looking through all of the CdrServer code I found several places where
     exception messages are caught and put into responses.  I change all of
     them to perform an entity conversion.  Everything else - command names,
     timestamps, exception codes, fixed error type names and messages - I left
     alone.
+ CdrSession.cpp:595:    return cdr::String(L"   <CdrCanDoResp>" + result + L"</CdrCanDoResp>");
- CdrShutdown.cpp:20:    return L"  <CdrShutdownResp/>\n";
+ CdrString.cpp:352:    elem += L">" + data + L"</" + tag + L">";
+ CdrString.cpp:363:    cdr::String s = L"   <Errors>\n";
+? CdrString.cpp:366:        s += L"    <Err>" + *i++ + L"</Err>\n";
     This one works for the vast majority of errors.  Error messages including
     text from the doc, like titles, could fail with this - unless the
     conversion is already made - which it might be in at least one case.  So
     this could be wrong but isn't safe to modify without a huge amount of
     analysis.
+ CdrString.cpp:367:    s += L"   </Errors>\n";
+ CdrString.cpp:437:            else if (c < 0 || c >= (int)getDecodingTableSize()) {
+ CdrString.cpp:555:                p[1] = codes[(bits[i + 0] << 4 | bits[i + 1] >> 4) & 0x3F];
+ CdrString.cpp:561:                p[1] = codes[(bits[i + 0] << 4 | bits[i + 1] >> 4) & 0x3F];
+ CdrString.cpp:562:                p[2] = codes[(bits[i + 1] << 2 | bits[i + 2] >> 6) & 0x3F];
+ CdrSysValue.cpp:245:     cdr::String resp = L"<" + tag + L">";
& CdrSysValue.cpp:247:          resp += L"\n <Value>" + retValue + L"</Value>\n";
     Returned value could contain anything.
+ CdrSysValue.cpp:248:     resp += L"</" + tag + L">\n";
- CdrTestClient.cpp:76:        requests = "<CdrCommandSet><SessionId>guest</SessionId>";
- CdrTestClient.cpp:77:        requests += "<CdrCommand><CdrGetDoc><DocId>CDR0000043753</DocId>";
- CdrTestClient.cpp:78:        requests += "</CdrGetDoc></CdrCommand></CdrCommandSet>";
- CdrTestClient.cpp:165:    std::cout << "<!-- Server response: -->\n" << response << '\n';
     Not writing to a client that can parse XML.
+ CdrValidateDoc.cpp:116:    errStr += L">" + errMsg + L"</Err>\n";
& CdrValidateDoc.cpp:252:            xml += L"<Err>" + *i++ + L"</Err>\n";
& CdrValidateDoc.cpp:270:            xml += L"<Err>" + *i++ + L"</Err>\n";
     The only two places we should convert errors, just before output.
+ CdrValidateDoc.cpp:275:    xml = L"<Errors" + countStr + L">\n" + xml + L"</Errors>\n";
+ CdrValidateDoc.cpp:315:        static_cast<const cdr::dom::Element&>(commandNode);
+ CdrValidateDoc.cpp:618:                           L"   <DocId>"
+ CdrValidateDoc.cpp:620:                         + L"</DocId>\n   <DocActiveStatus>"
+ CdrValidateDoc.cpp:622:                         + L"</DocActiveStatus>\n"
+ CdrValidateDoc.cpp:625:                         + L"  </CdrValidateDocResp>\n";
+ CdrVersion.cpp:795:            static_cast<cdr::dom::Node::NodeType>(c.getNodeType());
+ CdrVersion.cpp:807:  ver_string << L"<Version>" << version << L"</Version>";
+ CdrVersion.cpp:809:  return L"<CdrCheckOutResp>" + ver_string.str() + L"<CdrCheckOutResp/>";
- CdrVersion.cpp:820:  auto_ptr<cdr::String> comment;
- CdrVersion.cpp:858:          comment = auto_ptr<cdr::String>(new cdr::String(false));
- CdrVersion.cpp:862:            static_cast<cdr::dom::Node::NodeType>(c.getNodeType());
- CdrVersion.cpp:865:            comment = auto_ptr<cdr::String>(new cdr::String(c.getNodeValue()));
- CdrVersion.cpp:875:    ver_string << L"<Version>" << version << L"</Version>";
- CdrVersion.cpp:877:    ver_string << L"<Version/>";
+ CdrVersion.cpp:879:  return L"<CdrCheckInResp>" + ver_string.str() + L"<CdrCheckInResp/>";
- CdrVersion.cpp:907:            static_cast<cdr::dom::Node::NodeType>(c.getNodeType());
- CdrVersion.cpp:931:  return L"<CdrCreateLabelResp/>";
- CdrVersion.cpp:994:  return L"<CdrDeleteLabelResp/>";
- CdrVersion.cpp:1063:  return L"<CdrLabelDocumentResp/>";
- CdrVersion.cpp:1114:  return L"<CdrUnlabelDocumentResp/>";
- CdrVersion.cpp:1164:  response << L"<ListVersionsResp>";
- CdrVersion.cpp:1170:    response << L"<Version><Num>"
- CdrVersion.cpp:1172:             << L"</Num><Date>"
- CdrVersion.cpp:1174:             << L"</Date>";
+ CdrVersion.cpp:1176:      response << L"<Comment>"
+ CdrVersion.cpp:1178:               << L"</Comment>";
- CdrVersion.cpp:1179:    response << L"</Version>";
- CdrVersion.cpp:1182:  response << L"</ListVersionsResp>";
- CdrVersion.cpp:1218:  response << L"<LastVersionsResp>\n";
- CdrVersion.cpp:1232:  response << L" <LastVersionNum>"
- CdrVersion.cpp:1234:           << L"</LastVersionNum>\n";
- CdrVersion.cpp:1249:  response << L" <LastPubVersionNum>"
- CdrVersion.cpp:1251:           << L"</LastPubVersionNum>\n";
- CdrVersion.cpp:1255:  response << L" <IsChanged>"
- CdrVersion.cpp:1257:           << L"</IsChanged>\n";
- CdrVersion.cpp:1260:  response << L"</LastVersionsResp>\n";
- CdrXsd.cpp:506:              L" <xsl:template match='/'>\n"
- CdrXsd.cpp:507:              L"  <Errors>\n"
- CdrXsd.cpp:508:              L"   <xsl:apply-templates/>\n"
- CdrXsd.cpp:509:              L"  </Errors>\n"
- CdrXsd.cpp:510:              L" </xsl:template>\n\n"
- CdrXsd.cpp:511:              L" <xsl:template match='node()'>\n"
- CdrXsd.cpp:512:              L"  <xsl:apply-templates/>\n"
- CdrXsd.cpp:513:              L" </xsl:template>\n\n";
- CdrXsd.cpp:518:               << L"'>\n";
- CdrXsd.cpp:525:                   << L")'>\n"
- CdrXsd.cpp:526:                      L"   <xsl:call-template name='packError'>\n"
- CdrXsd.cpp:529:                   << L"\"'/>\n"
- CdrXsd.cpp:530:                      L"   </xsl:call-template>\n"
- CdrXsd.cpp:531:                      L"  </xsl:if>\n";
- CdrXsd.cpp:533:            os << L"  <xsl:apply-templates/>\n"
- CdrXsd.cpp:534:                  L" </xsl:template>\n\n";
- CdrXsd.cpp:536:        os << L" <xsl:template name='packError'>\n"
- CdrXsd.cpp:537:              L"  <xsl:param name='msg'/>\n"
- CdrXsd.cpp:538:              L"  <xsl:element name='Err'>\n"
- CdrXsd.cpp:539:              L"   <xsl:if test='./@cdr-eid'>\n"
- CdrXsd.cpp:540:              L"    <xsl:attribute name='cdr-eid'>\n"
- CdrXsd.cpp:541:              L"     <xsl:value-of select='./@cdr-eid'/>\n"
- CdrXsd.cpp:542:              L"    </xsl:attribute>\n"
- CdrXsd.cpp:543:              L"   </xsl:if>\n"
- CdrXsd.cpp:544:              L"   <xsl:call-template name='getPath'>\n"
- CdrXsd.cpp:545:              L"    <xsl:with-param name='nodePart' select='.'/>\n"
- CdrXsd.cpp:546:              L"   </xsl:call-template>\n"
- CdrXsd.cpp:547:              L"   <xsl:value-of select='concat(&quot;: &quot;, $msg)'/>\n"
- CdrXsd.cpp:548:              L"  </xsl:element>\n"
- CdrXsd.cpp:549:              L" </xsl:template>\n\n"
- CdrXsd.cpp:550:              L" <xsl:template name='getPath'>\n"
- CdrXsd.cpp:551:              L"  <xsl:param name='childPart'/>\n"
- CdrXsd.cpp:552:              L"  <xsl:param name='nodePart'/>\n"
- CdrXsd.cpp:557:              L"  <xsl:choose>\n"
- CdrXsd.cpp:558:              L"   <xsl:when test='name($parent)'>\n"
- CdrXsd.cpp:561:              L"    <xsl:call-template name='getPath'>\n"
- CdrXsd.cpp:567:              L"     <xsl:with-param name='nodePart' select='$parent'/>\n"
- CdrXsd.cpp:568:              L"    </xsl:call-template>\n"
- CdrXsd.cpp:569:              L"   </xsl:when>\n"
- CdrXsd.cpp:570:              L"   <xsl:otherwise>\n"
- CdrXsd.cpp:574:              L"   </xsl:otherwise>\n"
- CdrXsd.cpp:575:              L"  </xsl:choose>\n"
- CdrXsd.cpp:576:              L" </xsl:template>\n\n"
- CdrXsd.cpp:577:              L"</xsl:transform>\n";
- CdrXsd.cpp:627:    const cdr::dom::Element& e = static_cast<const cdr::dom::Element&>(n);
- CdrXsd.cpp:904:    const cdr::dom::Element& e = static_cast<const cdr::dom::Element&>(dn);
- CdrXsd.cpp:937:    const cdr::dom::Element& e = static_cast<const cdr::dom::Element&>(dn);
- CdrXsd.cpp:1050:    const cdr::dom::Element& e = static_cast<const cdr::dom::Element&>(dn);
- CdrXsd.cpp:1077:    const cdr::dom::Element& e = static_cast<const cdr::dom::Element&>(dn);
- CdrXsd.cpp:1563:                        (static_cast<cdr::dom::Element>(n)).getAttribute(
- CdrXsd.cpp:2450:        errCtl.setElementContext(static_cast<cdr::dom::Element&>(child));
- CdrXsd.cpp:2553:                 << (docOccs > 0 ? L"true" : L"false")
- CdrXsd.cpp:7070:       << L"\n\n  -->\n\n";
- CdrXsd.cpp:7098:        os << L"(#PCDATA)>\n";
- CdrXsd.cpp:7114:            os << L"EMPTY>\n";
- CdrXsd.cpp:7119:            os << L"(#PCDATA)>\n";
- CdrXsd.cpp:7145:            os << L")*>\n";
- CdrXsd.cpp:7181:            os << L">\n";
- CdrXsd.cpp:7208:                os << L" " << a->getName() << L" ";
- CdrXsd.cpp:7228:                    os << a->getDtdType();
- CdrXsd.cpp:7240:            os << L">\n";
+ CdrXsd.cpp:7246:            os << L"<!ELEMENT CdrDocCtl (DocId, DocTitle)>\n";
- CdrXsd.cpp:7247:            os << L"<!ATTLIST CdrDocCtl readyForReview CDATA #IMPLIED>\n";
- CdrXsd.cpp:7248:            os << L"<!ELEMENT DocId (#PCDATA)>\n";
- CdrXsd.cpp:7249:            os << L"<!ATTLIST DocId readonly (yes|no) #IMPLIED>\n";
- CdrXsd.cpp:7250:            os << L"<!ELEMENT DocTitle (#PCDATA)>\n";
- CdrXsd.cpp:7251:            os << L"<!ATTLIST DocTitle readonly (yes|no) #IMPLIED>\n";
- CdrXsd.cpp:7335:        os << g->getContent();
+ CdrXsd.cpp:7447:        writeDtdElement(const_cast<Element&>(*e), os);
+ CdrXsd.cpp:7659:        checkElementForAttribute(const_cast<Element&>(*e), attrName, elemList,
Connect.cpp:45:    rc = SQLConnect(hdbc, const_cast<SQLCHAR*>(dsn), SQL_NTS,
Connect.cpp:46:                          const_cast<SQLCHAR*>(uid), SQL_NTS,
Connect.cpp:47:                          const_cast<SQLCHAR*>(pwd), SQL_NTS);
FixDates.cpp:17:const wchar_t*  TAG         = L"<ChangeDate>";
ParseSchema.cpp:56:        std::wcerr << L"DOM Exception: " << de->code << cdr::String(L": ") 
ParseSchema.cpp:57:                   << cdr::String(de->msg)
ShutdownCdr.cpp:85:    std::string cmd = "<CdrCommandSet><CdrCommand><CdrLogon><UserName>";
ShutdownCdr.cpp:87:        +  "</UserName><Password>" 
ShutdownCdr.cpp:89:        +  "</Password></CdrLogon></CdrCommand>"
ShutdownCdr.cpp:90:           "<CdrCommand><CdrShutdown/></CdrCommand>"
ShutdownCdr.cpp:91:           "<CdrCommand><CdrLogoff/></CdrCommand></CdrCommandSet>";
xmlpp.cpp:671:		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
xmlpp.cpp:975:	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
xmlpp.cpp:991:		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
xmlpp.cpp:1024:		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )