Attachment #102003 for bug #136862

View | Details | Raw Unified | Return to bug 136862 | Differences between

and this patch




class  classic_versions  : public db_table<classic_versions> {
    public:
        long  id;
        long  _major;
        long  _minor;
        long  platformid;
        char  comment[254];
        char  filename[254];

    public:
        long  id;
        long  versionid;
        long  _major;
        long  _minor;
        classic_active_versions();
        classic_active_versions(const classic_active_versions &a);
        classic_active_versions(const SQL_ROW &a);




classic_versions::classic_versions() :
        db_table<classic_versions>(*this,-1),
        id(0),
        _major(0),
        _minor(0),
        platformid(0),
file_cksum(0) {
    db_open();

classic_versions::classic_versions(const classic_versions &a) :
        db_table<classic_versions>(*this,-1),
        id(a.id),
        _major(a._major),
        _minor(a._minor),
        platformid(a.platformid),
file_cksum(a.file_cksum) {
    db_open();

classic_versions &classic_versions::operator =(const classic_versions &a) {
    if (&a != this) {
        id=a.id;
        _major=a._major;
        _minor=a._minor;
        platformid=a.platformid;
        file_cksum=a.file_cksum;
        strcpy(comment,a.comment);

    if (show_ids)
        rv << id;
    rv << ',';
    rv << _major;
    rv << ',';
    rv << _minor;
    rv << ',';
    rv << platformid;
    rv << ',';

    xml_indent(2);
    if (show_ids)
        rv << xml_indent() << "<id>" << id << "</id>\n";
    rv << xml_indent() << "<major>" << _major << "</major>\n";
    rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
    rv << xml_indent() << "<platformid>" << platformid << "</platformid>\n";
    {
        std::string enc_field=xml_encode_string(comment,std::min(strlen(comment),sizeof(comment)));

                pos++;
            } while(sub[pos]=='\n');
            std::istringstream in(sub.c_str()+pos);
            in >> _major;
        }
        if (extract_xml_record(field,"minor",sub)) {
            pos=sub.find(">");

                pos++;
            } while(sub[pos]=='\n');
            std::istringstream in(sub.c_str()+pos);
            in >> _minor;
        }
        if (extract_xml_record(field,"platformid",sub)) {
            pos=sub.find(">");

    }
    {
        std::istringstream row(*(s[1]));
        row >> _major;
    }
    {
        std::istringstream row(*(s[2]));
        row >> _minor;
    }
    {
        std::istringstream row(*(s[3]));

        db_table<classic_active_versions>(*this,-1),
        id(0),
        versionid(0),
        _major(0),
_minor(0) {
    db_open();
}


        db_table<classic_active_versions>(*this,-1),
        id(a.id),
        versionid(a.versionid),
        _major(a._major),
_minor(a._minor) {
    db_open();
}


    if (&a != this) {
        id=a.id;
        versionid=a.versionid;
        _major=a._major;
        _minor=a._minor;
    }
    return (*this);
}

    rv << ',';
    rv << versionid;
    rv << ',';
    rv << _major;
    rv << ',';
    rv << _minor;
    return rv.str();
}


    if (show_ids)
        rv << xml_indent() << "<id>" << id << "</id>\n";
    rv << xml_indent() << "<versionid>" << versionid << "</versionid>\n";
    rv << xml_indent() << "<major>" << _major << "</major>\n";
    rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
    xml_indent(-2);
    rv << xml_indent() << "</" << tag << ">\n";
    return rv.str();

                pos++;
            } while(sub[pos]=='\n');
            std::istringstream in(sub.c_str()+pos);
            in >> _major;
        }
        if (extract_xml_record(field,"minor",sub)) {
            pos=sub.find(">");

                pos++;
            } while(sub[pos]=='\n');
            std::istringstream in(sub.c_str()+pos);
            in >> _minor;
        }
    }
}

    }
    {
        std::istringstream row(*(s[2]));
        row >> _major;
    }
    {
        std::istringstream row(*(s[3]));
        row >> _minor;
    }
}


Return to bug 136862

Lines 611-618 Link Here

(-)seti_boinc/db/schema_master.h.orig (-4 / +4 lines)
611	class classic_versions : public db_table<classic_versions> {	611	class classic_versions : public db_table<classic_versions> {
612	public:	612	public:
613	long id;	613	long id;
614	long major;	614	long _major;
615	long minor;	615	long _minor;
616	long platformid;	616	long platformid;
617	char comment[254];	617	char comment[254];
618	char filename[254];	618	char filename[254];
Lines 641-648 Link Here
641	public:	641	public:
642	long id;	642	long id;
643	long versionid;	643	long versionid;
644	long major;	644	long _major;
645	long minor;	645	long _minor;
646	classic_active_versions();	646	classic_active_versions();
647	classic_active_versions(const classic_active_versions &a);	647	classic_active_versions(const classic_active_versions &a);
648	classic_active_versions(const SQL_ROW &a);	648	classic_active_versions(const SQL_ROW &a);

Lines 6162-6169 Link Here

(-)seti_boinc/db/schema_master.cpp.orig (-28 / +28 lines)
6162	classic_versions::classic_versions() :	6162	classic_versions::classic_versions() :
6163	db_table<classic_versions>(*this,-1),	6163	db_table<classic_versions>(*this,-1),
6164	id(0),	6164	id(0),
6165	major(0),	6165	_major(0),
6166	minor(0),	6166	_minor(0),
6167	platformid(0),	6167	platformid(0),
6168	file_cksum(0) {	6168	file_cksum(0) {
6169	db_open();	6169	db_open();
Lines 6178-6185 Link Here
6178	classic_versions::classic_versions(const classic_versions &a) :	6178	classic_versions::classic_versions(const classic_versions &a) :
6179	db_table<classic_versions>(*this,-1),	6179	db_table<classic_versions>(*this,-1),
6180	id(a.id),	6180	id(a.id),
6181	major(a.major),	6181	_major(a._major),
6182	minor(a.minor),	6182	_minor(a._minor),
6183	platformid(a.platformid),	6183	platformid(a.platformid),
6184	file_cksum(a.file_cksum) {	6184	file_cksum(a.file_cksum) {
6185	db_open();	6185	db_open();
Lines 6212-6219 Link Here
6212	classic_versions &classic_versions::operator =(const classic_versions &a) {	6212	classic_versions &classic_versions::operator =(const classic_versions &a) {
6213	if (&a != this) {	6213	if (&a != this) {
6214	id=a.id;	6214	id=a.id;
6215	major=a.major;	6215	_major=a._major;
6216	minor=a.minor;	6216	_minor=a._minor;
6217	platformid=a.platformid;	6217	platformid=a.platformid;
6218	file_cksum=a.file_cksum;	6218	file_cksum=a.file_cksum;
6219	strcpy(comment,a.comment);	6219	strcpy(comment,a.comment);
Lines 6255-6263 Link Here
6255	if (show_ids)	6255	if (show_ids)
6256	rv << id;	6256	rv << id;
6257	rv << ',';	6257	rv << ',';
6258	rv << major;	6258	rv << _major;
6259	rv << ',';	6259	rv << ',';
6260	rv << minor;	6260	rv << _minor;
6261	rv << ',';	6261	rv << ',';
6262	rv << platformid;	6262	rv << platformid;
6263	rv << ',';	6263	rv << ',';
Lines 6284-6291 Link Here
6284	xml_indent(2);	6284	xml_indent(2);
6285	if (show_ids)	6285	if (show_ids)
6286	rv << xml_indent() << "<id>" << id << "</id>\n";	6286	rv << xml_indent() << "<id>" << id << "</id>\n";
6287	rv << xml_indent() << "<major>" << major << "</major>\n";	6287	rv << xml_indent() << "<major>" << _major << "</major>\n";
6288	rv << xml_indent() << "<minor>" << minor << "</minor>\n";	6288	rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
6289	rv << xml_indent() << "<platformid>" << platformid << "</platformid>\n";	6289	rv << xml_indent() << "<platformid>" << platformid << "</platformid>\n";
6290	{	6290	{
6291	std::string enc_field=xml_encode_string(comment,std::min(strlen(comment),sizeof(comment)));	6291	std::string enc_field=xml_encode_string(comment,std::min(strlen(comment),sizeof(comment)));
Lines 6337-6343 Link Here
6337	pos++;	6337	pos++;
6338	} while(sub[pos]=='\n');	6338	} while(sub[pos]=='\n');
6339	std::istringstream in(sub.c_str()+pos);	6339	std::istringstream in(sub.c_str()+pos);
6340	in >> major;	6340	in >> _major;
6341	}	6341	}
6342	if (extract_xml_record(field,"minor",sub)) {	6342	if (extract_xml_record(field,"minor",sub)) {
6343	pos=sub.find(">");	6343	pos=sub.find(">");
Lines 6345-6351 Link Here
6345	pos++;	6345	pos++;
6346	} while(sub[pos]=='\n');	6346	} while(sub[pos]=='\n');
6347	std::istringstream in(sub.c_str()+pos);	6347	std::istringstream in(sub.c_str()+pos);
6348	in >> minor;	6348	in >> _minor;
6349	}	6349	}
6350	if (extract_xml_record(field,"platformid",sub)) {	6350	if (extract_xml_record(field,"platformid",sub)) {
6351	pos=sub.find(">");	6351	pos=sub.find(">");
Lines 6443-6453 Link Here
6443	}	6443	}
6444	{	6444	{
6445	std::istringstream row(*(s[1]));	6445	std::istringstream row(*(s[1]));
6446	row >> major;	6446	row >> _major;
6447	}	6447	}
6448	{	6448	{
6449	std::istringstream row(*(s[2]));	6449	std::istringstream row(*(s[2]));
6450	row >> minor;	6450	row >> _minor;
6451	}	6451	}
6452	{	6452	{
6453	std::istringstream row(*(s[3]));	6453	std::istringstream row(*(s[3]));
Lines 6498-6505 Link Here
6498	db_table<classic_active_versions>(*this,-1),	6498	db_table<classic_active_versions>(*this,-1),
6499	id(0),	6499	id(0),
6500	versionid(0),	6500	versionid(0),
6501	major(0),	6501	_major(0),
6502	minor(0) {	6502	_minor(0) {
6503	db_open();	6503	db_open();
6504	}	6504	}
6505		6505
Lines 6508-6515 Link Here
6508	db_table<classic_active_versions>(*this,-1),	6508	db_table<classic_active_versions>(*this,-1),
6509	id(a.id),	6509	id(a.id),
6510	versionid(a.versionid),	6510	versionid(a.versionid),
6511	major(a.major),	6511	_major(a._major),
6512	minor(a.minor) {	6512	_minor(a._minor) {
6513	db_open();	6513	db_open();
6514	}	6514	}
6515		6515
Lines 6536-6543 Link Here
6536	if (&a != this) {	6536	if (&a != this) {
6537	id=a.id;	6537	id=a.id;
6538	versionid=a.versionid;	6538	versionid=a.versionid;
6539	major=a.major;	6539	_major=a._major;
6540	minor=a.minor;	6540	_minor=a._minor;
6541	}	6541	}
6542	return (*this);	6542	return (*this);
6543	}	6543	}
Lines 6574-6582 Link Here
6574	rv << ',';	6574	rv << ',';
6575	rv << versionid;	6575	rv << versionid;
6576	rv << ',';	6576	rv << ',';
6577	rv << major;	6577	rv << _major;
6578	rv << ',';	6578	rv << ',';
6579	rv << minor;	6579	rv << _minor;
6580	return rv.str();	6580	return rv.str();
6581	}	6581	}
6582		6582
Lines 6590-6597 Link Here
6590	if (show_ids)	6590	if (show_ids)
6591	rv << xml_indent() << "<id>" << id << "</id>\n";	6591	rv << xml_indent() << "<id>" << id << "</id>\n";
6592	rv << xml_indent() << "<versionid>" << versionid << "</versionid>\n";	6592	rv << xml_indent() << "<versionid>" << versionid << "</versionid>\n";
6593	rv << xml_indent() << "<major>" << major << "</major>\n";	6593	rv << xml_indent() << "<major>" << _major << "</major>\n";
6594	rv << xml_indent() << "<minor>" << minor << "</minor>\n";	6594	rv << xml_indent() << "<minor>" << _minor << "</minor>\n";
6595	xml_indent(-2);	6595	xml_indent(-2);
6596	rv << xml_indent() << "</" << tag << ">\n";	6596	rv << xml_indent() << "</" << tag << ">\n";
6597	return rv.str();	6597	return rv.str();
Lines 6624-6630 Link Here
6624	pos++;	6624	pos++;
6625	} while(sub[pos]=='\n');	6625	} while(sub[pos]=='\n');
6626	std::istringstream in(sub.c_str()+pos);	6626	std::istringstream in(sub.c_str()+pos);
6627	in >> major;	6627	in >> _major;
6628	}	6628	}
6629	if (extract_xml_record(field,"minor",sub)) {	6629	if (extract_xml_record(field,"minor",sub)) {
6630	pos=sub.find(">");	6630	pos=sub.find(">");
Lines 6632-6638 Link Here
6632	pos++;	6632	pos++;
6633	} while(sub[pos]=='\n');	6633	} while(sub[pos]=='\n');
6634	std::istringstream in(sub.c_str()+pos);	6634	std::istringstream in(sub.c_str()+pos);
6635	in >> minor;	6635	in >> _minor;
6636	}	6636	}
6637	}	6637	}
6638	}	6638	}
Lines 6648-6658 Link Here
6648	}	6648	}
6649	{	6649	{
6650	std::istringstream row(*(s[2]));	6650	std::istringstream row(*(s[2]));
6651	row >> major;	6651	row >> _major;
6652	}	6652	}
6653	{	6653	{
6654	std::istringstream row(*(s[3]));	6654	std::istringstream row(*(s[3]));
6655	row >> minor;	6655	row >> _minor;
6656	}	6656	}
6657	}	6657	}
6658		6658