Commit 9aefeb81 authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of newton:/data1/x0-0-0/pwr

parents d55df48a 6be5ad8f
......@@ -173,10 +173,7 @@ void* CnvXtthelpToHtml::insert(navh_eItemType item_type, const char* text1,
} else {
subject_to_fname(fname, link, 0);
if (!streq(link_bookmark, "")) {
strcat(fname, "#");
strcat(fname, link_bookmark);
} else if (file_name && !streq(file_name, "")) {
if (file_name && !streq(file_name, "")) {
char* s = (char*)strrchr(file_name, '/');
if (s)
strcpy(fname, s + 1);
......@@ -189,6 +186,10 @@ void* CnvXtthelpToHtml::insert(navh_eItemType item_type, const char* text1,
strcat(fname, link);
strcat(fname, ".html");
}
if (!streq(link_bookmark, "")) {
strcat(fname, "#");
strcat(fname, link_bookmark);
}
}
if (!in_table)
fp << "<A HREF=\"" << fname << "\">";
......@@ -259,6 +260,19 @@ void* CnvXtthelpToHtml::insert(navh_eItemType item_type, const char* text1,
strcpy(fname, link);
} else {
subject_to_fname(fname, link, 0);
if (file_name && !streq(file_name, "")) {
char* s = (char*)strrchr(file_name, '/');
if (s)
strcpy(fname, s + 1);
else
strcpy(fname, file_name);
s = strchr(fname, '.');
if (s)
*s = 0;
strcat(fname, "_");
strcat(fname, link);
strcat(fname, ".html");
}
if (!streq(link_bookmark, "")) {
strcat(fname, "#");
strcat(fname, link_bookmark);
......
......@@ -167,10 +167,8 @@ void rt_pvd_udb::load_systemgroup(SystemList* systemgroup)
strcpy(item.name, sname);
gu->get_system_data(sname, &body->Attributes, &item.oix, body->Description);
item.oix++;
item.oix = next_oix++;
if (next_oix <= item.oix)
next_oix = item.oix + 1;
item.cid = pwr_cClass_SystemGroupReg;
item.fthoix = menu_stack[menu_cnt - 1];
item.bwsoix = m_list[item.fthoix].lchoix;
......@@ -211,10 +209,7 @@ void rt_pvd_udb::load_user(UserList* user, SystemList* sg)
body = (pwr_sClass_UserReg*)calloc(1, sizeof(pwr_sClass_UserReg));
user->get_data(body->Password, &body->Privileges, &item.oix, body->FullName,
body->Description, body->Email, body->Phone, body->Sms);
item.oix++;
if (next_oix <= item.oix)
next_oix = item.oix + 1;
item.oix = next_oix++;
item.cid = pwr_cClass_UserReg;
item.fthoix = menu_stack[menu_cnt - 1];
......
......@@ -3,8 +3,8 @@ Version: 5.6.1-1
Section: base
Priority: optional
Architecture: i386
Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.5.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
Depends: libc6 (>= 2.24-11+deb9u3), libgtk2.0-0 (>= 2.24.31-2), libasound2 (>= 1.1.3-5), libsqlite3-0 (>= 3.16.2-5+deb9u1), libdb5.3 (>=5.3.28-12+deb9u1)
Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54,pwr55
Maintainer: Proview <postmaster@proview.se>
Description:
5.6.1-1 Base release
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment