diff --git a/ChangeLog b/ChangeLog index 3ee3437f..3539c868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20660,3 +20660,10 @@ Configuration' dialog in rdadmin(1) in the Operations Guide. 2020-11-29 Fred Gleason <fredg@paravelsystems.com> * Incremented the package version to 3.4.1int7. +2020-12-07 Fred Gleason <fredg@paravelsystems.com> + * Added a 'RDCart::ensureTitleIsUnique()' static method. + * Removed code to make cart titles automatically unique from + 'RDCart::setTitle()'. + * Refactored rdimport(1) to allow detection of duplicate titles. +2020-12-09 Fred Gleason <fredg@paravelsystems.com> + * Reverted changed from 2020-12-09. diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index 766e7bba..fa755366 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -2321,12 +2321,12 @@ QString RDCart::VerifyTitle(const QString &title) const int n=1; while(1==1) { sql=QString("select NUMBER from CART where ")+ - "(TITLE=\""+RDEscapeString(ret)+"\")&&"+ - QString().sprintf("(NUMBER!=%u)",cart_number); + "(TITLE=\""+RDEscapeString(ret)+"\")&&"+ + QString().sprintf("(NUMBER!=%u)",cart_number); q=new RDSqlQuery(sql); if(!q->first()) { - delete q; - return ret; + delete q; + return ret; } delete q; ret=title+QString().sprintf(" [%d]",n++);